Changeset 148367 in webkit

Timestamp:

Apr 13, 2013 3:01:47 PM (11 years ago)

Author:

robert@webkit.org

Message:

Whitespace between nowrap elements ignored after collapsed trailing space in a text run
​https://bugs.webkit.org/show_bug.cgi?id=17705

Reviewed by Ryosuke Niwa.

Source/WebCore:

Bug 93448 and r138654 fixed the treatment of line-breaks between nowrap elements. This augments
that fix by recognizing that we have a potential break not only in situations where the next character is a
space and the current character is not, but also where the next character is a space and the current character
*is* a space *and* we are ignoring spaces. This is so because any spaces we have ignored up to this point
after the actual word end will get collapsed away even if we don't end up taking the line break.

In a nutshell, if we allow whitespace collapsing 'word ' and 'word' are equivalent when before a whitespace
character, so treat the first as well as the second as a potential linebreak.

Test: fast/text/whitespace/inline-whitespace-wrapping-5.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::LineBreaker::nextSegmentBreak):

LayoutTests:

• fast/text/whitespace/inline-whitespace-wrapping-5-expected.html: Added.
• fast/text/whitespace/inline-whitespace-wrapping-5.html: Added.
• fast/text/whitespace/inline-whitespace-wrapping-6-expected.html: Added.
• fast/text/whitespace/inline-whitespace-wrapping-6.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/whitespace/inline-whitespace-wrapping-5-expected.html (added)
• LayoutTests/fast/text/whitespace/inline-whitespace-wrapping-5.html (added)
• LayoutTests/fast/text/whitespace/inline-whitespace-wrapping-6-expected.html (added)
• LayoutTests/fast/text/whitespace/inline-whitespace-wrapping-6.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-04  Robert Hogan  <robert@webkit.org>
+
+        Whitespace between nowrap elements ignored after collapsed trailing space in a text run
+        https://bugs.webkit.org/show_bug.cgi?id=17705
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/text/whitespace/inline-whitespace-wrapping-5-expected.html: Added.
+        * fast/text/whitespace/inline-whitespace-wrapping-5.html: Added.
+        * fast/text/whitespace/inline-whitespace-wrapping-6-expected.html: Added.
+        * fast/text/whitespace/inline-whitespace-wrapping-6.html: Added.
+
 2013-04-13  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-04  Robert Hogan  <robert@webkit.org>
+
+        Whitespace between nowrap elements ignored after collapsed trailing space in a text run
+        https://bugs.webkit.org/show_bug.cgi?id=17705
+
+        Reviewed by Ryosuke Niwa.
+
+        Bug 93448 and r138654 fixed the treatment of line-breaks between nowrap elements. This augments
+        that fix by recognizing that we have a potential break not only in situations where the next character is a 
+        space and the current character is not, but also where the next character is a space and the current character 
+        *is* a space *and* we are ignoring spaces. This is so because any spaces we have ignored up to this point 
+        after the actual word end will get collapsed away even if we don't end up taking the line break. 
+
+        In a nutshell, if we allow whitespace collapsing 'word  ' and 'word' are equivalent when before a whitespace
+        character, so treat the first as well as the second as a potential linebreak.
+
+        Test: fast/text/whitespace/inline-whitespace-wrapping-5.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::LineBreaker::nextSegmentBreak):
+
 2013-04-13  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -3216 +3216 @@
                 if (nextText->textLength()) {
                     UChar c = nextText->characterAt(0);
-                    // If the next item on the line is text, and if we did not end with
-                    // a space, then the next text run continues our word (and so it needs to
-                    // keep adding to the uncommitted width. Just update and continue.
-                    checkForBreak = !currentCharacterIsSpace && (c == ' ' || c == '\t' || (c == '\n' && !next->preservesNewline()));
+                    // If we allow whitespace collapsing, 'word  ' and 'word' are equivalent before a whitespace
+                    // character, so treat both as a potential linebreak.
+                    checkForBreak = (ignoringSpaces || !currentCharacterIsSpace) && (c == ' ' || c == '\t' || (c == '\n' && !next->preservesNewline()));
                 } else if (nextText->isWordBreak())
                     checkForBreak = true;