Changeset 148223 in webkit

Timestamp:

Apr 11, 2013 12:17:12 PM (11 years ago)

Author:

robert@webkit.org

Message:

REGRESSION (142152): ensure we skip past out-of-flow objects when detecting whitespace to ignore after leading empty inlines
​https://bugs.webkit.org/show_bug.cgi?id=114311

Reviewed by Emil A Eklund.

Source/WebCore:

When we hit an empty inline in line layout and try to detect whether it has any whitespace after it that we ought to ignore, then
we need to skip past out-of-flow and floating objects when looking for that whitespace. Failure to do so will result in us
adding the width from the first space we encounter to our line width and over-estimating the real width of the line.

We're hitting this bug now because we have broadened the category of empty inlines that get lineboxes so we go into line layout
and have to deal with them and their subsequent whitespace there. Previously this sort of whitespace would have been simply
consumed by |skipLeadingWhitespace|.

Test: fast/inline/out-of-flow-objects-and-whitespace-after-empty-inline.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::shouldSkipWhitespaceAfterStartObject):

LayoutTests:

• fast/inline/out-of-flow-objects-and-whitespace-after-empty-inline-expected.txt: Added.
• fast/inline/out-of-flow-objects-and-whitespace-after-empty-inline.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/out-of-flow-objects-and-whitespace-after-empty-inline-expected.txt (added)
• LayoutTests/fast/inline/out-of-flow-objects-and-whitespace-after-empty-inline.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-11  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION (142152): ensure we skip past out-of-flow objects when detecting whitespace to ignore after leading empty inlines
+        https://bugs.webkit.org/show_bug.cgi?id=114311
+
+        Reviewed by Emil A Eklund.
+
+        * fast/inline/out-of-flow-objects-and-whitespace-after-empty-inline-expected.txt: Added.
+        * fast/inline/out-of-flow-objects-and-whitespace-after-empty-inline.html: Added.
+
 2013-04-11  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-11  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION (142152): ensure we skip past out-of-flow objects when detecting whitespace to ignore after leading empty inlines
+        https://bugs.webkit.org/show_bug.cgi?id=114311
+
+        Reviewed by Emil A Eklund.
+
+        When we hit an empty inline in line layout and try to detect whether it has any whitespace after it that we ought to ignore, then
+        we need to skip past out-of-flow and floating objects when looking for that whitespace. Failure to do so will result in us
+        adding the width from the first space we encounter to our line width and over-estimating the real width of the line.
+
+        We're hitting this bug now because we have broadened the category of empty inlines that get lineboxes so we go into line layout 
+        and have to deal with them and their subsequent whitespace there. Previously this sort of whitespace would have been simply
+        consumed by |skipLeadingWhitespace|.
+
+        Test: fast/inline/out-of-flow-objects-and-whitespace-after-empty-inline.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::shouldSkipWhitespaceAfterStartObject):
+
 2013-04-11  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2448 +2448 @@
 {
     RenderObject* next = bidiNextSkippingEmptyInlines(block, o);
+    while (next && next->isFloatingOrOutOfFlowPositioned())
+        next = bidiNextSkippingEmptyInlines(block, next);
+
     if (next && !next->isBR() && next->isText() && toRenderText(next)->textLength() > 0) {
         RenderText* nextText = toRenderText(next);