Changeset 177881 in webkit

Timestamp:

Jan 4, 2015 4:46:39 PM (9 years ago)

Author:

Antti Koivisto

Message:

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

Follow-up to follow-up, fonts/font-fallback-prefers-pictographs.html is now failing.

• platform/graphics/FontGlyphs.cpp:

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

Make the loop again go one past the last fallback index, the pictograph special case depends on it.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ -4 +4 @@
         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.
+        Follow-up to follow-up, fonts/font-fallback-prefers-pictographs.html is now failing.
+
+        * platform/graphics/FontGlyphs.cpp:
+        (WebCore::FontGlyphs::glyphDataForVariant):
+        (WebCore::FontGlyphs::glyphDataForNormalVariant):
+
+            Make the loop again go one past the last fallback index, the pictograph special case depends on it.
+
+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.
 
         * platform/graphics/FontGlyphs.cpp:

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