Changeset 131405 in webkit

Timestamp:

Oct 15, 2012 8:47:25 PM (12 years ago)

Author:

mitz@apple.com

Message:

Layout Test fast/text/justify-ideograph-leading-expansion.html is failing an assertion chromium mac
​https://bugs.webkit.org/show_bug.cgi?id=99406

Reviewed by Darin Adler.

• platform/graphics/WidthIterator.cpp:
• platform/graphics/WidthIterator.h:

(WebCore::WidthIterator::shouldApplyFontTransforms): Changed to return false if the run is
shorter than 2 characters. 1-character are invariant under font transforms, and therefore
Font::codePath() sends them through WidthIterator even on platforms where WidthIterator
does not support kerning and ligatures.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-15  Dan Bernstein  <mitz@apple.com>
+
+        Layout Test fast/text/justify-ideograph-leading-expansion.html is failing an assertion chromium mac
+        https://bugs.webkit.org/show_bug.cgi?id=99406
+
+        Reviewed by Darin Adler.
+
+        * platform/graphics/WidthIterator.cpp:
+        * platform/graphics/WidthIterator.h:
+        (WebCore::WidthIterator::shouldApplyFontTransforms): Changed to return false if the run is
+        shorter than 2 characters. 1-character are invariant under font transforms, and therefore
+        Font::codePath() sends them through WidthIterator even on platforms where WidthIterator
+        does not support kerning and ligatures.
+
 2012-10-15  Michael Saboff  <msaboff@apple.com>
 

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

@@ -28 +28 @@
 #include "SimpleFontData.h"
 #include "SurrogatePairAwareTextIterator.h"
-#include "TextRun.h"
 #include <wtf/MathExtras.h>
 

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

@@ -25 +25 @@
 #include "Font.h"
 #include "SVGGlyph.h"
+#include "TextRun.h"
 #include <wtf/HashSet.h>
 #include <wtf/Vector.h>
@@ -92 +93 @@
     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;