Changeset 131375 in webkit

Timestamp:

Oct 15, 2012, 3:52:35 PM (14 years ago)

Author:

mitz@apple.com

Message:

Try to fix assertion failures on ports that do not support kerning and ligatures on the fast
code path after r131365.

• platform/graphics/WidthIterator.cpp:

(WebCore::applyFontTransforms): Changed the early return condition to not bother with 1-glyph
sequences.

• platform/graphics/WidthIterator.h:

(WebCore::WidthIterator::shouldApplyFontTransforms): Changed to return false if the run is
shorter than 2 characters.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/WidthIterator.cpp (modified) (1 diff)
• platform/graphics/WidthIterator.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-15  Dan Bernstein  <mitz@apple.com>
+
+        Try to fix assertion failures on ports that do not support kerning and ligatures on the fast
+        code path after r131365.
+
+        * platform/graphics/WidthIterator.cpp:
+        (WebCore::applyFontTransforms): Changed the early return condition to not bother with 1-glyph
+        sequences.
+        * platform/graphics/WidthIterator.h:
+        (WebCore::WidthIterator::shouldApplyFontTransforms): Changed to return false if the run is
+        shorter than 2 characters.
+
 2012-10-15  Dan Bernstein  <mitz@apple.com>
 

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

@@ -110 +110 @@
 
     int glyphBufferSize = glyphBuffer->size();
-    if (glyphBuffer->size() <= lastGlyphCount)
+    if (glyphBuffer->size() <= lastGlyphCount + 1)
         return 0;
 

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

@@ -92 +92 @@
     inline unsigned advanceInternal(TextIterator&, GlyphBuffer*);
 
-    bool shouldApplyFontTransforms() const { return m_typesettingFeatures & (Kerning | Ligatures); }
+    bool shouldApplyFontTransforms() const { return m_run.length() > 1 && (m_typesettingFeatures & (Kerning | Ligatures)); }
 
     TypesettingFeatures m_typesettingFeatures;