Changeset 177878 in webkit

Timestamp:

Jan 4, 2015, 3:38:36 PM (10 years ago)

Author:

Antti Koivisto

Message:

Remove GlyphPageTree
​https://bugs.webkit.org/show_bug.cgi?id=140015

Follow-up to r177876 to fix mathml/opentype/munderover-layout-resize.html which is asserting in bots.

• platform/graphics/FontGlyphs.cpp:

(WebCore::FontGlyphs::glyphDataForVariant):
(WebCore::FontGlyphs::glyphDataForNormalVariant):

Always return system fallback if no glyph is found.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontGlyphs.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-04  Antti Koivisto  <antti@apple.com>
+
+        Remove GlyphPageTree
+        https://bugs.webkit.org/show_bug.cgi?id=140015
+
+        Follow-up to r177876 to fix mathml/opentype/munderover-layout-resize.html which is asserting in bots.
+
+        * platform/graphics/FontGlyphs.cpp:
+        (WebCore::FontGlyphs::glyphDataForVariant):
+        (WebCore::FontGlyphs::glyphDataForNormalVariant):
+
+        Always return system fallback if no glyph is found.
+
 2015-01-04  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp

@@ -277 +277 @@
 GlyphData FontGlyphs::glyphDataForVariant(UChar32 c, const FontDescription& description, FontDataVariant variant, unsigned fallbackLevel)
 {
-    for (; fallbackLevel <= description.familyCount(); ++fallbackLevel) {
+    for (; fallbackLevel < description.familyCount(); ++fallbackLevel) {
         auto* fontData = realizeFontDataAt(description, fallbackLevel);
         if (!fontData)
-            return glyphDataForSystemFallback(c, description, variant);
+            break;
 
         auto* simpleFontData = fontData->simpleFontDataForCharacter(c);
@@ -294 +294 @@
         }
     }
-    ASSERT_NOT_REACHED();
-    return GlyphData();
+
+    return glyphDataForSystemFallback(c, description, variant);
 }
 
@@ -302 +302 @@
     const unsigned pageNumber = c / GlyphPage::size;
 
-    for (unsigned fallbackLevel = 0; fallbackLevel <= description.familyCount(); ++fallbackLevel) {
+    for (unsigned fallbackLevel = 0; fallbackLevel < description.familyCount(); ++fallbackLevel) {
         auto* fontData = realizeFontDataAt(description, fallbackLevel);
         if (!fontData)
-            return glyphDataForSystemFallback(c, description, NormalVariant);
-
+            break;
         auto* simpleFontData = fontData->simpleFontDataForCharacter(c);
         auto* page = simpleFontData ? simpleFontData->glyphPage(pageNumber) : nullptr;
@@ -332 +331 @@
     }
 
-    ASSERT_NOT_REACHED();
-    return GlyphData();
+    return glyphDataForSystemFallback(c, description, NormalVariant);
 }