Changeset 110642 in webkit

Timestamp:

Mar 13, 2012 4:57:32 PM (12 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/11025217> [Mac] Assertion failure in collectComplexTextRunsForCharactersCoreText
​https://bugs.webkit.org/show_bug.cgi?id=77044

Reviewed by Sam Weinig.

Source/WebCore:

Test: platform/mac/fast/text/core-text-fallback-to-unknown-font.html

Handle the case of Core Text choosing a fallback font that NSFontManager cannot find by name.

• platform/graphics/FontCache.h:

(FontCache): Made ComplexTextController a friend class.

• platform/graphics/mac/ComplexTextControllerCoreText.mm:

(WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): Removed the
failing assertion, which was not true, and added code to handle the case where a font
cannot be found by name by using the font as returned from Core Text.

LayoutTests:

• platform/mac/fast/text/core-text-fallback-to-unknown-font-expected.txt: Added.
• platform/mac/fast/text/core-text-fallback-to-unknown-font.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/core-text-fallback-to-unknown-font-expected.txt (added)
• LayoutTests/platform/mac/fast/text/core-text-fallback-to-unknown-font.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/FontCache.h (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-13  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/11025217> [Mac] Assertion failure in collectComplexTextRunsForCharactersCoreText
+        https://bugs.webkit.org/show_bug.cgi?id=77044
+
+        Reviewed by Sam Weinig.
+
+        * platform/mac/fast/text/core-text-fallback-to-unknown-font-expected.txt: Added.
+        * platform/mac/fast/text/core-text-fallback-to-unknown-font.html: Added.
+
 2012-03-13  Erik Arvidsson  <arv@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-13  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/11025217> [Mac] Assertion failure in collectComplexTextRunsForCharactersCoreText
+        https://bugs.webkit.org/show_bug.cgi?id=77044
+
+        Reviewed by Sam Weinig.
+
+        Test: platform/mac/fast/text/core-text-fallback-to-unknown-font.html
+
+        Handle the case of Core Text choosing a fallback font that NSFontManager cannot find by name.
+
+        * platform/graphics/FontCache.h:
+        (FontCache): Made ComplexTextController a friend class.
+        * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+        (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): Removed the
+        failing assertion, which was not true, and added code to handle the case where a font
+        cannot be found by name by using the font as returned from Core Text.
+
 2012-03-13  Erik Arvidsson  <arv@chromium.org>
 

trunk/Source/WebCore/platform/graphics/FontCache.h

@@ -131 +131 @@
     int m_purgePreventCount;
 
+#if USE(CORE_TEXT)
+    friend class ComplexTextController;
+#endif
     friend class SimpleFontData; // For getCachedFontData(const FontPlatformData*)
     friend class FontFallbackList;

trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

@@ -272 +272 @@
                     }
                     runFontData = fontCache()->getCachedFontData(m_font.fontDescription(), fontName.get(), false, FontCache::DoNotRetain);
+                    // Core Text may have used a font that is not known to NSFontManager. In that case, fall back on
+                    // using the font as returned, even though it may not have the best NSFontRenderingMode.
+                    if (!runFontData) {
+                        FontPlatformData runFontPlatformData((NSFont *)runFont, CTFontGetSize(runFont));
+                        runFontData = fontCache()->getCachedFontData(&runFontPlatformData, FontCache::DoNotRetain);
+                    }
                 }
-                ASSERT(runFontData);
                 if (m_fallbackFonts && runFontData != m_font.primaryFont())
                     m_fallbackFonts->add(runFontData);