<!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>[245755] branches/safari-608.1.24.20-branch/Source/WebCore</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/245755">245755</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-05-24 14:47:36 -0700 (Fri, 24 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/245753">r245753</a>. rdar://problem/51068494

    Refactor how showLetterpressedGlyphsWithAdvances gets the graphics context.
    https://bugs.webkit.org/show_bug.cgi?id=198225

    Reviewed by Dean Jackson.

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

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245753 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari60812420branchSourceWebCoreChangeLog">branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari60812420branchSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">branches/safari-608.1.24.20-branch/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari60812420branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog (245754 => 245755)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog      2019-05-24 21:47:32 UTC (rev 245754)
+++ branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog 2019-05-24 21:47:36 UTC (rev 245755)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2019-05-24  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r245753. rdar://problem/51068494
+
+    Refactor how showLetterpressedGlyphsWithAdvances gets the graphics context.
+    https://bugs.webkit.org/show_bug.cgi?id=198225
+    
+    Reviewed by Dean Jackson.
+    
+    * platform/graphics/cocoa/FontCascadeCocoa.mm:
+    (WebCore::showLetterpressedGlyphsWithAdvances):
+    (WebCore::FontCascade::drawGlyphs):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245753 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-24  Timothy Hatcher  <timothy@apple.com>
+
+            Refactor how showLetterpressedGlyphsWithAdvances gets the graphics context.
+            https://bugs.webkit.org/show_bug.cgi?id=198225
+
+            Reviewed by Dean Jackson.
+
+            * platform/graphics/cocoa/FontCascadeCocoa.mm:
+            (WebCore::showLetterpressedGlyphsWithAdvances):
+            (WebCore::FontCascade::drawGlyphs):
+
+2019-05-24  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r245752. rdar://problem/51068494
</span><span class="cx"> 
</span><span class="cx">     Plumb dark appearance down to GraphicsContext.
</span></span></pre></div>
<a id="branchessafari60812420branchSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24.20-branch/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (245754 => 245755)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm    2019-05-24 21:47:32 UTC (rev 245754)
+++ branches/safari-608.1.24.20-branch/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm       2019-05-24 21:47:36 UTC (rev 245755)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void showLetterpressedGlyphsWithAdvances(const FloatPoint& point, const Font& font, CGContextRef context, const CGGlyph* glyphs, const CGSize* advances, unsigned count)
</del><ins>+static void showLetterpressedGlyphsWithAdvances(const FloatPoint& point, const Font& font, GraphicsContext& coreContext, const CGGlyph* glyphs, const CGSize* advances, unsigned count)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(LETTERPRESS)
</span><span class="cx">     if (!count)
</span><span class="lines">@@ -110,6 +110,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    CGContextRef context = coreContext.platformContext();
+
</ins><span class="cx">     CGContextSetTextPosition(context, point.x(), point.y());
</span><span class="cx">     Vector<CGPoint, 256> positions(count);
</span><span class="cx">     fillVectorWithHorizontalGlyphPositions(positions, context, advances, count);
</span><span class="lines">@@ -127,6 +129,10 @@
</span><span class="cx">         styleConfiguration.useSimplifiedEffect = YES;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/FontCascadeCocoaAdditions.mm>)
+#include <WebKitAdditions/FontCascadeCocoaAdditions.mm>
+#endif
+
</ins><span class="cx">     CGContextSetFont(context, adoptCF(CTFontCopyGraphicsFont(ctFont, nullptr)).get());
</span><span class="cx">     CGContextSetFontSize(context, platformData.size());
</span><span class="cx"> 
</span><span class="lines">@@ -137,7 +143,7 @@
</span><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(point);
</span><span class="cx">     UNUSED_PARAM(font);
</span><del>-    UNUSED_PARAM(context);
</del><ins>+    UNUSED_PARAM(coreContext);
</ins><span class="cx">     UNUSED_PARAM(glyphs);
</span><span class="cx">     UNUSED_PARAM(advances);
</span><span class="cx">     UNUSED_PARAM(count);
</span><span class="lines">@@ -299,7 +305,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (useLetterpressEffect)
</span><del>-        showLetterpressedGlyphsWithAdvances(point, font, cgContext, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
</del><ins>+        showLetterpressedGlyphsWithAdvances(point, font, context, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
</ins><span class="cx">     else
</span><span class="cx">         showGlyphsWithAdvances(point, font, cgContext, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
</span><span class="cx">     if (syntheticBoldOffset)
</span></span></pre>
</div>
</div>

</body>
</html>