Changeset 103206 in webkit

Timestamp:

Dec 18, 2011, 6:51:46 PM (13 years ago)

Author:

mitz@apple.com

Message:

Positioned Floats: Assertion hit in fast/block/positioning/positioned-float-layout-after-image-load.html
​https://bugs.webkit.org/show_bug.cgi?id=67759

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/block/positioning/positioned-float-layout-after-image-load.html

Positioned floats are both floating and positioned. Made the following functions treat them as
positioned rather than as floats by reordering code.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::LineBreaker::skipTrailingWhitespace):
(WebCore::RenderBlock::LineBreaker::skipLeadingWhitespace):
(WebCore::RenderBlock::LineBreaker::nextLineBreak):

LayoutTests:

Re-added this test from r94695.

• fast/block/positioning/positioned-float-layout-after-image-load-expected.txt: Copied from LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt.
• fast/block/positioning/positioned-float-layout-after-image-load.html: Copied from LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html.
• fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html: Copied from LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt (added)
• LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html (added)
• LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-18  Dan Bernstein  <mitz@apple.com>
+
+        Positioned Floats: Assertion hit in fast/block/positioning/positioned-float-layout-after-image-load.html
+        https://bugs.webkit.org/show_bug.cgi?id=67759
+
+        Reviewed by Darin Adler.
+
+        Re-added this test from r94695.
+
+        * fast/block/positioning/positioned-float-layout-after-image-load-expected.txt: Copied from LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt.
+        * fast/block/positioning/positioned-float-layout-after-image-load.html: Copied from LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html.
+        * fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html: Copied from LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html.
+
 2011-12-18  Hajime Morrita  <morrita@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-18  Dan Bernstein  <mitz@apple.com>
+
+        Positioned Floats: Assertion hit in fast/block/positioning/positioned-float-layout-after-image-load.html
+        https://bugs.webkit.org/show_bug.cgi?id=67759
+
+        Reviewed by Darin Adler.
+
+        Test: fast/block/positioning/positioned-float-layout-after-image-load.html
+
+        Positioned floats are both floating and positioned. Made the following functions treat them as
+        positioned rather than as floats by reordering code.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::LineBreaker::skipTrailingWhitespace):
+        (WebCore::RenderBlock::LineBreaker::skipLeadingWhitespace):
+        (WebCore::RenderBlock::LineBreaker::nextLineBreak):
+
 2011-12-18  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1862 +1862 @@
     while (!iterator.atEnd() && !requiresLineBox(iterator, lineInfo, TrailingWhitespace)) {
         RenderObject* object = iterator.m_obj;
-        if (object->isFloating()) {
+        if (object->isPositioned())
+            setStaticPositions(m_block, toRenderBox(object));
+        else if (object->isFloating())
             m_block->insertFloatingObject(toRenderBox(object));
-        } else if (object->isPositioned())
-            setStaticPositions(m_block, toRenderBox(object));
         iterator.increment();
     }
@@ -1875 +1875 @@
     while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) {
         RenderObject* object = resolver.position().m_obj;
-        if (object->isFloating())
+        if (object->isPositioned())
+            setStaticPositions(m_block, toRenderBox(object));
+        else if (object->isFloating())
             m_block->positionNewFloatOnLine(m_block->insertFloatingObject(toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width);
-        else if (object->isPositioned())
-            setStaticPositions(m_block, toRenderBox(object));
         resolver.increment();
     }
@@ -2157 +2157 @@
         }
 
-        if (current.m_obj->isFloating()) {
+        if (current.m_obj->isPositioned()) {
+            // If our original display wasn't an inline type, then we can
+            // go ahead and determine our static inline position now.
+            RenderBox* box = toRenderBox(current.m_obj);
+            bool isInlineType = box->style()->isOriginalDisplayInlineType();
+            if (!isInlineType)
+                m_block->setStaticInlinePositionForChild(box, m_block->logicalHeight(), m_block->startOffsetForContent(m_block->logicalHeight()));
+            else  {
+                // If our original display was an INLINE type, then we can go ahead
+                // and determine our static y position now.
+                box->layer()->setStaticBlockPosition(m_block->logicalHeight());
+            }
+
+            // If we're ignoring spaces, we have to stop and include this object and
+            // then start ignoring spaces again.
+            if (isInlineType || current.m_obj->container()->isRenderInline()) {
+                if (ignoringSpaces) {
+                    ignoreStart.m_obj = current.m_obj;
+                    ignoreStart.m_pos = 0;
+                    addMidpoint(lineMidpointState, ignoreStart); // Stop ignoring spaces.
+                    addMidpoint(lineMidpointState, ignoreStart); // Start ignoring again.
+                }
+                trailingObjects.appendBoxIfNeeded(box);
+            } else
+                m_positionedObjects.append(box);
+        } else if (current.m_obj->isFloating()) {
             RenderBox* floatBox = toRenderBox(current.m_obj);
             FloatingObject* f = m_block->insertFloatingObject(floatBox);
@@ -2171 +2196 @@
             } else
                 floatsFitOnLine = false;
-        } else if (current.m_obj->isPositioned()) {
-            // If our original display wasn't an inline type, then we can
-            // go ahead and determine our static inline position now.
-            RenderBox* box = toRenderBox(current.m_obj);
-            bool isInlineType = box->style()->isOriginalDisplayInlineType();
-            if (!isInlineType)
-                m_block->setStaticInlinePositionForChild(box, m_block->logicalHeight(), m_block->startOffsetForContent(m_block->logicalHeight()));
-            else  {
-                // If our original display was an INLINE type, then we can go ahead
-                // and determine our static y position now.
-                box->layer()->setStaticBlockPosition(m_block->logicalHeight());
-            }
-
-            // If we're ignoring spaces, we have to stop and include this object and
-            // then start ignoring spaces again.
-            if (isInlineType || current.m_obj->container()->isRenderInline()) {
-                if (ignoringSpaces) {
-                    ignoreStart.m_obj = current.m_obj;
-                    ignoreStart.m_pos = 0;
-                    addMidpoint(lineMidpointState, ignoreStart); // Stop ignoring spaces.
-                    addMidpoint(lineMidpointState, ignoreStart); // Start ignoring again.
-                }
-                trailingObjects.appendBoxIfNeeded(box);
-            } else
-                m_positionedObjects.append(box);
         } else if (current.m_obj->isRenderInline()) {
             // Right now, we should only encounter empty inlines here.