Changeset 129068 in webkit

Timestamp:

Sep 19, 2012, 4:37:36 PM (13 years ago)

Author:

mitz@apple.com

Message:

When kerning is enabled, word spacing is doubly accounted for in RenderText::computePreferredLogicalWidths
​https://bugs.webkit.org/show_bug.cgi?id=97146

Reviewed by Anders Carlsson.

Source/WebCore:

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

• rendering/RenderText.cpp:

(WebCore::RenderText::computePreferredLogicalWidths): When kerning is enabled, words are
measured with their trailing space, if there is one, then the width of a space is subtracted.
Changed that width, stored in the local variable wordTrailingSpaceWidth, to include the
word spacing, since it is included in the result of widthFromCache().

LayoutTests:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/word-space-with-kerning-expected.html (added)
• LayoutTests/fast/text/word-space-with-kerning.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-19  Dan Bernstein  <mitz@apple.com>
+
+        When kerning is enabled, word spacing is doubly accounted for in RenderText::computePreferredLogicalWidths
+        https://bugs.webkit.org/show_bug.cgi?id=97146
+
+        Reviewed by Anders Carlsson.
+
+        * fast/text/word-space-with-kerning-expected.html: Added.
+        * fast/text/word-space-with-kerning.html: Added.
+
 2012-09-19  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-19  Dan Bernstein  <mitz@apple.com>
+
+        When kerning is enabled, word spacing is doubly accounted for in RenderText::computePreferredLogicalWidths
+        https://bugs.webkit.org/show_bug.cgi?id=97146
+
+        Reviewed by Anders Carlsson.
+
+        Test: fast/text/word-space-with-kerning.html
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::computePreferredLogicalWidths): When kerning is enabled, words are
+        measured with their trailing space, if there is one, then the width of a space is subtracted.
+        Changed that width, stored in the local variable wordTrailingSpaceWidth, to include the
+        word spacing, since it is included in the result of widthFromCache().
+
 2012-09-19  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -967 +967 @@
     // Non-zero only when kerning is enabled, in which case we measure words with their trailing
     // space, then subtract its width.
-    float wordTrailingSpaceWidth = f.typesettingFeatures() & Kerning ? f.width(RenderBlock::constructTextRun(this, f, &space, 1, styleToUse)) : 0;
+    float wordTrailingSpaceWidth = f.typesettingFeatures() & Kerning ? f.width(RenderBlock::constructTextRun(this, f, &space, 1, styleToUse)) + wordSpacing : 0;
 
     // If automatic hyphenation is allowed, we keep track of the width of the widest word (or word