Changeset 148027 in webkit

Timestamp:

Apr 9, 2013 9:46:49 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Whitespace in particular source code changes rendering; does not in Firefox
​https://bugs.webkit.org/show_bug.cgi?id=100943

Patch by Arnaud Renevier <​a.renevier@sisa.samsung.com> on 2013-04-09
Reviewed by Darin Adler.

Source/WebCore:

A render inline which requires a line box is considered a possible
trailing object. So, ensureLineBoxInsideIgnoredSpaces will be called
for it, even if it is placed after a text render ending with a single
space.

Tests: fast/text/whitespace/trailing-space-before-empty-span-1.html

fast/text/whitespace/trailing-space-before-empty-span-2.html

• rendering/RenderBlockLineLayout.cpp:

(TrailingObjects):
(WebCore::TrailingObjects::appendBoxIfNeeded):
(WebCore::RenderBlock::LineBreaker::nextSegmentBreak):

LayoutTests:

• fast/text/whitespace/trailing-space-before-empty-span-1-expected.html: Added.
• fast/text/whitespace/trailing-space-before-empty-span-1.html: A test

with a span whose text ends with a single span. A following span
is empty but requires a line box (because it has some padding).
The second span should be rendered.

• fast/text/whitespace/trailing-space-before-empty-span-2-expected.html: Added.
• fast/text/whitespace/trailing-space-before-empty-span-2.html: Same

test as trailing-space-before-empty-span-1.html except that second
span contains whitespace only text.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/whitespace/trailing-space-before-empty-span-1-expected.html (added)
• LayoutTests/fast/text/whitespace/trailing-space-before-empty-span-1.html (added)
• LayoutTests/fast/text/whitespace/trailing-space-before-empty-span-2-expected.html (added)
• LayoutTests/fast/text/whitespace/trailing-space-before-empty-span-2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-09  Arnaud Renevier  <a.renevier@sisa.samsung.com>
+
+        Whitespace in particular source code changes rendering; does not in Firefox
+        https://bugs.webkit.org/show_bug.cgi?id=100943
+
+        Reviewed by Darin Adler.
+
+        * fast/text/whitespace/trailing-space-before-empty-span-1-expected.html: Added.
+        * fast/text/whitespace/trailing-space-before-empty-span-1.html: A test
+            with a span whose text ends with a single span. A following span
+            is empty but requires a line box (because it has some padding).
+            The second span should be rendered.
+        * fast/text/whitespace/trailing-space-before-empty-span-2-expected.html: Added.
+        * fast/text/whitespace/trailing-space-before-empty-span-2.html: Same
+            test as trailing-space-before-empty-span-1.html except that second
+            span contains whitespace only text.
+
 2013-04-09  Andrei Bucur  <abucur@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-09  Arnaud Renevier  <a.renevier@sisa.samsung.com>
+
+        Whitespace in particular source code changes rendering; does not in Firefox
+        https://bugs.webkit.org/show_bug.cgi?id=100943
+
+        Reviewed by Darin Adler.
+
+        A render inline which requires a line box is considered a possible
+        trailing object. So, ensureLineBoxInsideIgnoredSpaces will be called
+        for it, even if it is placed after a text render ending with a single
+        space.
+
+        Tests: fast/text/whitespace/trailing-space-before-empty-span-1.html
+               fast/text/whitespace/trailing-space-before-empty-span-2.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (TrailingObjects):
+        (WebCore::TrailingObjects::appendBoxIfNeeded):
+        (WebCore::RenderBlock::LineBreaker::nextSegmentBreak):
+
 2013-04-09  Andrei Bucur  <abucur@adobe.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2515 +2515 @@
     void setTrailingWhitespace(RenderText*);
     void clear();
-    void appendBoxIfNeeded(RenderBox*);
+    void appendBoxIfNeeded(RenderBoxModelObject*);
 
     enum CollapseFirstSpaceOrNot { DoNotCollapseFirstSpace, CollapseFirstSpace };
@@ -2523 +2523 @@
 private:
     RenderText* m_whitespace;
-    Vector<RenderBox*, 4> m_boxes;
+    Vector<RenderBoxModelObject*, 4> m_boxes;
 };
 
@@ -2543 +2543 @@
 }
 
-inline void TrailingObjects::appendBoxIfNeeded(RenderBox* box)
+inline void TrailingObjects::appendBoxIfNeeded(RenderBoxModelObject* box)
 {
     if (m_whitespace)
@@ -2814 +2814 @@
                     currentCharacterIsWS = true;
                     ignoringSpaces = true;
+                } else {
+                    trailingObjects.appendBoxIfNeeded(flowBox);
                 }
             }