Changeset 93909 in webkit

Timestamp:

Aug 26, 2011, 1:43:48 PM (14 years ago)

Author:

mitz@apple.com

Message:

RenderText::computePreferredLogicalWidths() should measure words with trailing spaces
​https://bugs.webkit.org/show_bug.cgi?id=66733

Source/WebCore:

Patch by Ned Holbrook <​nholbrook@apple.com> on 2011-08-26
Reviewed by Dan Bernstein.

Test: fast/text/complex-preferred-logical-widths.html

• rendering/RenderText.cpp:

(WebCore::RenderText::computePreferredLogicalWidths): Apply logic from RenderBlock::LineBreaker::nextLineBreak().

LayoutTests:

• fast/text/complex-preferred-logical-widths.html: Added.
• platform/mac/fast/text/complex-preferred-logical-widths-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/complex-preferred-logical-widths.html (added)
• LayoutTests/platform/mac/fast/text/complex-preferred-logical-widths-expected.png (added)
• LayoutTests/platform/mac/fast/text/complex-preferred-logical-widths-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderText.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-26  Dan Bernstein  <mitz@apple.com>
+
+        RenderText::computePreferredLogicalWidths() should measure words with trailing spaces
+        https://bugs.webkit.org/show_bug.cgi?id=66733
+
+        * fast/text/complex-preferred-logical-widths.html: Added.
+        * platform/mac/fast/text/complex-preferred-logical-widths-expected.txt: Added.
+
 2011-08-26  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-26  Ned Holbrook  <nholbrook@apple.com>
+
+        RenderText::computePreferredLogicalWidths() should measure words with trailing spaces
+        https://bugs.webkit.org/show_bug.cgi?id=66733
+
+        Reviewed by Dan Bernstein.
+
+        Test: fast/text/complex-preferred-logical-widths.html
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::computePreferredLogicalWidths): Apply logic from RenderBlock::LineBreaker::nextLineBreak().
+
 2011-08-26  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -915 +915 @@
     int lastWordBoundary = 0;
 
+    // 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, style())) : 0;
+
     int firstGlyphLeftOverflow = -1;
 
@@ -984 +988 @@
         int wordLen = j - i;
         if (wordLen) {
-            float w = widthFromCache(f, i, wordLen, leadWidth + currMaxWidth, &fallbackFonts, &glyphOverflow);
+            bool isSpace = (j < len) && isSpaceAccordingToStyle(c, style());
+            float w;
+            if (wordTrailingSpaceWidth && isSpace)
+                w = widthFromCache(f, i, wordLen + 1, leadWidth + currMaxWidth, &fallbackFonts, &glyphOverflow) - wordTrailingSpaceWidth;
+            else
+                w = widthFromCache(f, i, wordLen, leadWidth + currMaxWidth, &fallbackFonts, &glyphOverflow);
+
             if (firstGlyphLeftOverflow < 0)
                 firstGlyphLeftOverflow = glyphOverflow.left;
@@ -996 +1006 @@
             }
 
-            bool isSpace = (j < len) && isSpaceAccordingToStyle(c, style());
             bool isCollapsibleWhiteSpace = (j < len) && style()->isCollapsibleWhiteSpace(c);
             if (j < len && style()->autoWrap())