Changeset 80414 in webkit

Timestamp:

Mar 5, 2011 1:20:43 AM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/9082946> Make the Core Text code path in GlyphPage::fill() more robust
​https://bugs.webkit.org/show_bug.cgi?id=55817

Reviewed by Cameron Zwarich.

• platform/graphics/mac/GlyphPageTreeNodeMac.cpp:

(WebCore::GlyphPage::fill): When determining if a CTRun uses the primary font, compare against
a CGFont obtained from Core Text for the primary font. This CGFont may be different from
the CGFont stored in the FontPlatformData.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/GlyphPageTreeNodeMac.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-05  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Cameron Zwarich.
+
+        <rdar://problem/9082946> Make the Core Text code path in GlyphPage::fill() more robust
+        https://bugs.webkit.org/show_bug.cgi?id=55817
+
+        * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
+        (WebCore::GlyphPage::fill): When determining if a CTRun uses the primary font, compare against
+        a CGFont obtained from Core Text for the primary font. This CGFont may be different from
+        the CGFont stored in the FontPlatformData.
+
 2011-03-05  Ilya Sherman  <isherman@chromium.org>
 

trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp

@@ -84 +84 @@
         Vector<CFIndex, 512> indexVector;
         bool done = false;
+
+        // For the CGFont comparison in the loop, use the CGFont that Core Text assigns to the CTFont. This may
+        // be non-CFEqual to fontData->platformData().cgFont().
+        RetainPtr<CGFontRef> cgFont(AdoptCF, CTFontCopyGraphicsFont(fontData->platformData().ctFont(), 0));
+
         for (CFIndex r = 0; r < runCount && !done ; ++r) {
             // CTLine could map characters over multiple fonts using its own font fallback list.
@@ -94 +99 @@
             RetainPtr<CGFontRef> runCGFont(AdoptCF, CTFontCopyGraphicsFont(runFont, 0));
             // Use CGFont here as CFEqual for CTFont counts all attributes for font.
-            if (CFEqual(fontData->platformData().cgFont(), runCGFont.get())) {
+            if (CFEqual(cgFont.get(), runCGFont.get())) {
                 // This run uses the font we want. Extract glyphs.
                 CFIndex glyphCount = CTRunGetGlyphCount(ctRun);