Changeset 190891 in webkit

Timestamp:

Oct 12, 2015 3:08:27 PM (9 years ago)

Author:

mmaxfield@apple.com

Message:

REGRESSION(r182192): Ligatures do not interact correctly with SHY in some fonts
​https://bugs.webkit.org/show_bug.cgi?id=150006

Reviewed by Simon Fraser.

Source/WebCore:

When performing font transforms and we encounter kCGFontIndexInvalid, we filter it out of the
GlyphBuffer. However, this filter was only interacting with part of the GlyphBuffer instead
of the whole thing. This causes glyph IDs from one font to be rendered with other fonts,
thereby showing garbage glyphs.

However, now that <rdar://problem/20230073> is fixed, we don't need to perform this filter in
the first place.

Test: fast/text/undefined-glyph-with-ligature.html

• platform/graphics/GlyphBuffer.h:

(WebCore::GlyphBuffer::copyItem):
(WebCore::GlyphBuffer::swap):

• platform/graphics/WidthIterator.cpp:

(WebCore::WidthIterator::applyFontTransforms):

LayoutTests:

• fast/text/resources/tiny-ligature-font.svg: Added.
• fast/text/undefined-glyph-with-ligature-expected.html: Added.
• fast/text/undefined-glyph-with-ligature.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/resources/tiny-ligature-font.svg (added)
• LayoutTests/fast/text/undefined-glyph-with-ligature-expected.html (added)
• LayoutTests/fast/text/undefined-glyph-with-ligature.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/WidthIterator.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-10-12  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION(r182192): Ligatures do not interact correctly with SHY in some fonts
+        https://bugs.webkit.org/show_bug.cgi?id=150006
+
+        Reviewed by Simon Fraser.
+
+        * fast/text/resources/tiny-ligature-font.svg: Added.
+        * fast/text/undefined-glyph-with-ligature-expected.html: Added.
+        * fast/text/undefined-glyph-with-ligature.html: Added.
+
 2015-10-12  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-12  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION(r182192): Ligatures do not interact correctly with SHY in some fonts
+        https://bugs.webkit.org/show_bug.cgi?id=150006
+
+        Reviewed by Simon Fraser.
+
+        When performing font transforms and we encounter kCGFontIndexInvalid, we filter it out of the
+        GlyphBuffer. However, this filter was only interacting with part of the GlyphBuffer instead
+        of the whole thing. This causes glyph IDs from one font to be rendered with other fonts,
+        thereby showing garbage glyphs.
+
+        However, now that <rdar://problem/20230073> is fixed, we don't need to perform this filter in
+        the first place.
+
+        Test: fast/text/undefined-glyph-with-ligature.html
+
+        * platform/graphics/GlyphBuffer.h:
+        (WebCore::GlyphBuffer::copyItem):
+        (WebCore::GlyphBuffer::swap):
+        * platform/graphics/WidthIterator.cpp:
+        (WebCore::WidthIterator::applyFontTransforms):
+
 2015-10-12  Antoine Quint  <graouts@apple.com>
 

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

@@ -155 +155 @@
     }
     charactersTreatedAsSpace.clear();
-
-#if PLATFORM(MAC) || PLATFORM(IOS)
-    // Workaround for <rdar://problem/20230073> FIXME: Please remove this when no longer needed.
-    GlyphBufferGlyph* glyphs = glyphBuffer->glyphs(0);
-    int filteredIndex = lastGlyphCount;
-    for (int i = lastGlyphCount; i < glyphBufferSize; ++i) {
-        glyphs[filteredIndex] = glyphs[i];
-        advances[filteredIndex] = advances[i];
-        if (glyphs[filteredIndex] != kCGFontIndexInvalid)
-            ++filteredIndex;
-    }
-    glyphBufferSize = filteredIndex;
-#endif
 
     for (int i = lastGlyphCount; i < glyphBufferSize; ++i)