Attachment 288210 Details for Bug 161119 – platformWidthForGlyph

[patch] platformWidthForGlyph

bug-161119-20160907171212.patch (text/plain), 3.76 KB, created by Myles C. Maxfield on 2016-09-07 17:14:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2016-09-07 17:14:36 PDT

Size: 3.76 KB

patch

obsolete

>Subversion Revision: 205533
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 16911c1e0a09d5e4f4db7cb17576c89ff7399942..956009c4a6c7115232c0400dd7a29cdaedc79843 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2016-09-07  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        [Cocoa] Improve performance of glyph advance metrics gathering
>+        https://bugs.webkit.org/show_bug.cgi?id=161119
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests (OOPS!).
>+
>+        * platform/graphics/cocoa/FontCocoa.mm:
>+        (WebCore::Font::platformWidthForGlyph):
>+
> 2016-09-06  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r205521, r205526, and r205532.
>diff --git a/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
>index f3001f5061ca1d87870bb690ecdf5563c59785a1..c0db4cc9df5249c9931e121206415c3f56b735f1 100644
>--- a/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
>@@ -596,6 +596,7 @@ FloatRect Font::platformBoundsForGlyph(Glyph glyph) const
>     return boundingBox;
> }
> 
>+#if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000))
> static inline Optional<CGSize> advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph)
> {
>     CTFontRef font = platformData.font();
>@@ -617,16 +618,30 @@ static inline bool canUseFastGlyphAdvanceGetter(const FontPlatformData& platform
>     }
>     return true;
> }
>+#endif
> 
> float Font::platformWidthForGlyph(Glyph glyph) const
> {
>     CGSize advance = CGSizeZero;
>     bool horizontal = platformData().orientation() == Horizontal;
>+    CGFontRenderingStyle style = kCGFontRenderingStyleAntialiasing | kCGFontRenderingStyleSubpixelPositioning | kCGFontRenderingStyleSubpixelQuantization | kCGFontAntialiasingStyleUnfiltered;
>+
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
>+    if (platformData().size()) {
>+        CTFontOrientation orientation = horizontal || m_isBrokenIdeographFallback ? kCTFontOrientationHorizontal : kCTFontOrientationVertical;
>+        // FIXME: Remove this special-casing when <rdar://problem/28197291> is fixed.
>+        if (CTFontIsAppleColorEmoji(m_platformData.ctFont()))
>+            CTFontGetAdvancesForGlyphs(m_platformData.ctFont(), orientation, &glyph, &advance, 1);
>+        else
>+            CTFontGetUnsummedAdvancesForGlyphsAndStyle(m_platformData.ctFont(), orientation, style, &glyph, &advance, 1);
>+    }
>+
>+#else
>+
>     bool populatedAdvance = false;
>     if ((horizontal || m_isBrokenIdeographFallback) && canUseFastGlyphAdvanceGetter(this->platformData(), glyph, advance, populatedAdvance)) {
>         float pointSize = platformData().size();
>         CGAffineTransform m = CGAffineTransformMakeScale(pointSize, pointSize);
>-        CGFontRenderingStyle style = kCGFontRenderingStyleAntialiasing | kCGFontRenderingStyleSubpixelPositioning | kCGFontRenderingStyleSubpixelQuantization | kCGFontAntialiasingStyleUnfiltered;
>         if (!CGFontGetGlyphAdvancesForStyle(platformData().cgFont(), &m, style, &glyph, 1, &advance)) {
>             RetainPtr<CFStringRef> fullName = adoptCF(CGFontCopyFullName(platformData().cgFont()));
>             LOG_ERROR("Unable to cache glyph widths for %@ %f", fullName.get(), pointSize);
>@@ -634,6 +649,7 @@ float Font::platformWidthForGlyph(Glyph glyph) const
>         }
>     } else if (!populatedAdvance && platformData().size())
>         CTFontGetAdvancesForGlyphs(m_platformData.ctFont(), horizontal ? kCTFontOrientationHorizontal : kCTFontOrientationVertical, &glyph, &advance, 1);
>+#endif
> 
>     return advance.width + m_syntheticBoldOffset;
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 161119: 286808 | 286823 | 286828 | 287002 | 287003 | 287008 | 287012 | 287013 | 287047 | 287050 | 287086 | 287117 | 287122 | 287214 | 287922 | 288169 | 288183 | 288210 | 288223 | 288228 | 288230 | 288231 | 288282 | 288293 | 288295 | 288297 | 288299 | 288319 | 288330 | 288343 | 288365 | 288368 | 288392 | 288393