Changeset 148358 in webkit

Timestamp:

Apr 13, 2013 9:38:41 AM (11 years ago)

Author:

Antoine Quint

Message:

Width of last of consecutive tabs may be incorrect with "white-space: pre-wrap"
​https://bugs.webkit.org/show_bug.cgi?id=114562

Reviewed by Dan Bernstein.

Source/WebCore:

When we measure the last word of a RenderText, make sure we use the correct x
position taking into account the current accumulated word measurements up to
this character. This is of particular importance in the case of tabs where the
measured width would differ based on the x position.

Test: fast/text/tab-last-word-in-renderer-pre-wrap.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::setLogicalWidthForTextRun):

LayoutTests:

• fast/text/tab-last-word-in-renderer-pre-wrap-expected.html: Added.
• fast/text/tab-last-word-in-renderer-pre-wrap.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/tab-last-word-in-renderer-pre-wrap-expected.html (added)
• LayoutTests/fast/text/tab-last-word-in-renderer-pre-wrap.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-13  Antoine Quint  <graouts@apple.com>
+
+        Width of last of consecutive tabs may be incorrect with "white-space: pre-wrap"
+        https://bugs.webkit.org/show_bug.cgi?id=114562
+
+        Reviewed by Dan Bernstein.
+
+        * fast/text/tab-last-word-in-renderer-pre-wrap-expected.html: Added.
+        * fast/text/tab-last-word-in-renderer-pre-wrap.html: Added.
+
 2013-04-12  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-13  Antoine Quint  <graouts@apple.com>
+
+        Width of last of consecutive tabs may be incorrect with "white-space: pre-wrap"
+        https://bugs.webkit.org/show_bug.cgi?id=114562
+
+        Reviewed by Dan Bernstein.
+
+        When we measure the last word of a RenderText, make sure we use the correct x
+        position taking into account the current accumulated word measurements up to
+        this character. This is of particular importance in the case of tabs where the
+        measured width would differ based on the x position.
+
+        Test: fast/text/tab-last-word-in-renderer-pre-wrap.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::setLogicalWidthForTextRun):
+
 2013-04-13  Mark Salisbury  <mark.salisbury@hp.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -865 +865 @@
             if (kerningIsEnabled && lastEndOffset == run->m_stop) {
                 int wordLength = lastEndOffset - wordMeasurement.startOffset;
-                measuredWidth += renderer->width(wordMeasurement.startOffset, wordLength, xPos, lineInfo.isFirstLine());
+                measuredWidth += renderer->width(wordMeasurement.startOffset, wordLength, xPos + measuredWidth, lineInfo.isFirstLine());
                 if (i > 0 && wordLength == 1 && renderer->characterAt(wordMeasurement.startOffset) == ' ')
                     measuredWidth += renderer->style()->wordSpacing();