<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206422] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206422">206422</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-09-27 01:10:34 -0700 (Tue, 27 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/205883">r205883</a>): Letterpressed text is invisible
https://bugs.webkit.org/show_bug.cgi?id=162590
Source/WebCore:

&lt;rdar://problem/28141512&gt;

Reviewed by Simon Fraser.

<a href="http://trac.webkit.org/projects/webkit/changeset/205883">r205883</a> removed the last place where we use CGFonts directly in WebKit. However,
our letterpress code is sensitive to the current state of the CGContext.

Tests: fast/text/letterpress-different.html
       fast/text/letterpress-paint.html

* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::showLetterpressedGlyphsWithAdvances):

LayoutTests:

Reviewed by Simon Fraser.

Letterpress is only implemented on iOS, so letterpress-different.html is marked
as only passing on iOS. letterpress-paint.html makes sure that letterpressed paint
is not invisible.

* TestExpectations:
* fast/text/letterpress-different-expected-mismatch.html: Added.
* fast/text/letterpress-different.html: Added.
* fast/text/letterpress-paint-expected-mismatch.html: Added.
* fast/text/letterpress-paint.html: Added.
* platform/ios-simulator/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextletterpressdifferentexpectedmismatchhtml">trunk/LayoutTests/fast/text/letterpress-different-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextletterpressdifferenthtml">trunk/LayoutTests/fast/text/letterpress-different.html</a></li>
<li><a href="#trunkLayoutTestsfasttextletterpresspaintexpectedmismatchhtml">trunk/LayoutTests/fast/text/letterpress-paint-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextletterpresspainthtml">trunk/LayoutTests/fast/text/letterpress-paint.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206421 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-09-27 07:58:48 UTC (rev 206421)
+++ trunk/LayoutTests/ChangeLog        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-27  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        REGRESSION(r205883): Letterpressed text is invisible
+        https://bugs.webkit.org/show_bug.cgi?id=162590
+
+        Reviewed by Simon Fraser.
+
+        Letterpress is only implemented on iOS, so letterpress-different.html is marked
+        as only passing on iOS. letterpress-paint.html makes sure that letterpressed paint
+        is not invisible.
+
+        * TestExpectations:
+        * fast/text/letterpress-different-expected-mismatch.html: Added.
+        * fast/text/letterpress-different.html: Added.
+        * fast/text/letterpress-paint-expected-mismatch.html: Added.
+        * fast/text/letterpress-paint.html: Added.
+        * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2017-09-26  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Marking css3/filters/backdrop/backdrop-filter-with-reflection* tests as flaky on Sierra WK1.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (206421 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations        2016-09-27 07:58:48 UTC (rev 206421)
+++ trunk/LayoutTests/TestExpectations        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -982,3 +982,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/161088 imported/w3c/web-platform-tests/resource-timing/resource-timing.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/162414 imported/w3c/web-platform-tests/resource-timing/idlharness.html [ Pass Failure ]
</span><ins>+
+# Only iOS has implemented lettepress.
+fast/text/letterpress-different.html [ ImageOnlyFailure ]
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextletterpressdifferentexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/letterpress-different-expected-mismatch.html (0 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/letterpress-different-expected-mismatch.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/letterpress-different-expected-mismatch.html        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;font: 17px -apple-system;&quot;&gt;Test passes if this text has a letterpress effect.&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextletterpressdifferenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/letterpress-different.html (0 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/letterpress-different.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/letterpress-different.html        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;font: 17px -apple-system; text-decoration: -webkit-letterpress;&quot;&gt;Test passes if this text has a letterpress effect.&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextletterpresspaintexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/letterpress-paint-expected-mismatch.html (0 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/letterpress-paint-expected-mismatch.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/letterpress-paint-expected-mismatch.html        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextletterpresspainthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/letterpress-paint.html (0 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/letterpress-paint.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/letterpress-paint.html        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;font: 17px -apple-system; text-decoration: -webkit-letterpress;&quot;&gt;Test passes if something paints.&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (206421 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations        2016-09-27 07:58:48 UTC (rev 206421)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -2660,3 +2660,6 @@
</span><span class="cx"> webkit.org/b/161949 imported/w3c/web-platform-tests/XMLHttpRequest/response-method.htm [ Failure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/130972 transitions/3d/interrupted-transition.html [ Pass Timeout ]
</span><ins>+
+# Only iOS has implemented lettepress.
+fast/text/letterpress-different.html [ Pass ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206421 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-09-27 07:58:48 UTC (rev 206421)
+++ trunk/Source/WebCore/ChangeLog        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-09-27  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        REGRESSION(r205883): Letterpressed text is invisible
+        https://bugs.webkit.org/show_bug.cgi?id=162590
+        &lt;rdar://problem/28141512&gt;
+
+        Reviewed by Simon Fraser.
+
+        r205883 removed the last place where we use CGFonts directly in WebKit. However,
+        our letterpress code is sensitive to the current state of the CGContext.
+
+        Tests: fast/text/letterpress-different.html
+               fast/text/letterpress-paint.html
+
+        * platform/graphics/cocoa/FontCascadeCocoa.mm:
+        (WebCore::showLetterpressedGlyphsWithAdvances):
+
</ins><span class="cx"> 2016-09-27  Youenn Fablet  &lt;youenn@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Fetch API] Refactor FetchBody to use std::experimental::variant
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (206421 => 206422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm        2016-09-27 07:58:48 UTC (rev 206421)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm        2016-09-27 08:10:34 UTC (rev 206422)
</span><span class="lines">@@ -120,7 +120,13 @@
</span><span class="cx">         styleConfiguration.useSimplifiedEffect = YES;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    CGContextSetFont(context, adoptCF(CTFontCopyGraphicsFont(ctFont, nullptr)).get());
+    CGContextSetFontSize(context, platformData.size());
+
</ins><span class="cx">     [catalog drawGlyphs:glyphs atPositions:positions.data() inContext:context withFont:ctFont count:count stylePresetName:@&quot;_UIKitNewLetterpressStyle&quot; styleConfiguration:styleConfiguration foregroundColor:CGContextGetFillColorAsColor(context)];
</span><ins>+
+    CGContextSetFont(context, nullptr);
+    CGContextSetFontSize(context, 0);
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(point);
</span><span class="cx">     UNUSED_PARAM(font);
</span></span></pre>
</div>
</div>

</body>
</html>