Changeset 129233 in webkit

Timestamp:

Sep 21, 2012 9:21:08 AM (12 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r126763): Incorrect line breaking when both kerning and word spacing are enabled
​https://bugs.webkit.org/show_bug.cgi?id=97280

Reviewed by Adele Peterson.

Source/WebCore:

Font::width() never applies word spacing to the first character in the TextRun. The
TextLayout optimization tried to achieve this behavior by not applying word spacing to
any character, which led to this bug.

Test: fast/text/word-space-with-kerning-2.html

• platform/graphics/mac/ComplexTextController.cpp:

(WebCore::TextLayout::TextLayout): Changed to use the given font rather than a version
without word spacing.
(WebCore::TextLayout::width): Added a check if the run starts with a space at a non-zero
offset. If that is the case, then the ComplexTextController has added word spacing to that
space, so subtract it here in order to maintain the behavior described above.

LayoutTests:

• fast/text/word-space-with-kerning-2-expected.html: Added.
• fast/text/word-space-with-kerning-2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/word-space-with-kerning-2-expected.html (added)
• LayoutTests/fast/text/word-space-with-kerning-2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-21  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r126763): Incorrect line breaking when both kerning and word spacing are enabled
+        https://bugs.webkit.org/show_bug.cgi?id=97280
+
+        Reviewed by Adele Peterson.
+
+        * fast/text/word-space-with-kerning-2-expected.html: Added.
+        * fast/text/word-space-with-kerning-2.html: Added.
+
 2012-09-21  Sudarsana Nagineni  <sudarsana.nagineni@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-21  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r126763): Incorrect line breaking when both kerning and word spacing are enabled
+        https://bugs.webkit.org/show_bug.cgi?id=97280
+
+        Reviewed by Adele Peterson.
+
+        Font::width() never applies word spacing to the first character in the TextRun. The
+        TextLayout optimization tried to achieve this behavior by not applying word spacing to
+        any character, which led to this bug.
+
+        Test: fast/text/word-space-with-kerning-2.html
+
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::TextLayout::TextLayout): Changed to use the given font rather than a version
+        without word spacing.
+        (WebCore::TextLayout::width): Added a check if the run starts with a space at a non-zero
+        offset. If that is the case, then the ComplexTextController has added word spacing to that
+        space, so subtract it here in order to maintain the behavior described above.
+
 2012-09-21  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp

@@ -49 +49 @@
 
     TextLayout(RenderText* text, const Font& font, float xPos)
-        : m_font(fontWithNoWordSpacing(font))
+        : m_font(font)
         , m_run(constructTextRun(text, font, xPos))
         , m_controller(adoptPtr(new ComplexTextController(&m_font, m_run, true)))
@@ -59 +59 @@
         m_controller->advance(from, 0, ByWholeGlyphs);
         float beforeWidth = m_controller->runWidthSoFar();
+        if (m_font.wordSpacing() && from && Font::treatAsSpace(m_run[from]))
+            beforeWidth += m_font.wordSpacing();
         m_controller->advance(from + len, 0, ByWholeGlyphs);
         float afterWidth = m_controller->runWidthSoFar();
@@ -65 +67 @@
 
 private:
-    static Font fontWithNoWordSpacing(const Font& originalFont)
-    {
-        Font font(originalFont);
-        font.setWordSpacing(0);
-        return font;
-    }
-
     static TextRun constructTextRun(RenderText* text, const Font& font, float xPos)
     {