Changeset 245753 in webkit

Timestamp:

May 24, 2019 2:41:32 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/FontCascadeCocoa.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm

@@ -99 +99 @@
 }
 
-static void showLetterpressedGlyphsWithAdvances(const FloatPoint& point, const Font& font, CGContextRef context, const CGGlyph* glyphs, const CGSize* advances, unsigned count)
+static void showLetterpressedGlyphsWithAdvances(const FloatPoint& point, const Font& font, GraphicsContext& coreContext, const CGGlyph* glyphs, const CGSize* advances, unsigned count)
 {
 #if ENABLE(LETTERPRESS)
@@ -110 +110 @@
         return;
     }
+
+    CGContextRef context = coreContext.platformContext();
 
     CGContextSetTextPosition(context, point.x(), point.y());
@@ -127 +129 @@
         styleConfiguration.useSimplifiedEffect = YES;
     }
+
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/FontCascadeCocoaAdditions.mm>)
+#include <WebKitAdditions/FontCascadeCocoaAdditions.mm>
+#endif
 
     CGContextSetFont(context, adoptCF(CTFontCopyGraphicsFont(ctFont, nullptr)).get());
@@ -138 +144 @@
     UNUSED_PARAM(point);
     UNUSED_PARAM(font);
-    UNUSED_PARAM(context);
+    UNUSED_PARAM(coreContext);
     UNUSED_PARAM(glyphs);
     UNUSED_PARAM(advances);
@@ -300 +306 @@
 
     if (useLetterpressEffect)
-        showLetterpressedGlyphsWithAdvances(point, font, cgContext, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
+        showLetterpressedGlyphsWithAdvances(point, font, context, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
     else
         showGlyphsWithAdvances(point, font, cgContext, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);