Changeset 86160 in webkit

Timestamp:

May 10, 2011 9:40:35 AM (13 years ago)

Author:

inferno@chromium.org

Message:

2011-05-10 Abhishek Arya <​inferno@chromium.org>

Reviewed by Simon Fraser.

Add containsFloats call to hasOverhangingFloats.
​https://bugs.webkit.org/show_bug.cgi?id=60537

Test: fast/block/float/no-overhanging-float-crash.html

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::repaintOverhangingFloats):
• rendering/RenderBlock.h: (WebCore::RenderBlock::hasOverhangingFloats):

2011-05-10 Abhishek Arya <​inferno@chromium.org>

Reviewed by Simon Fraser.

Tests that we do not crash due to wrong result from
hasOverhangingFloats.
​https://bugs.webkit.org/show_bug.cgi?id=60537

• fast/block/float/no-overhanging-float-crash-expected.txt: Added.
• fast/block/float/no-overhanging-float-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/no-overhanging-float-crash-expected.txt (added)
• LayoutTests/fast/block/float/no-overhanging-float-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-10  Abhishek Arya  <inferno@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        Tests that we do not crash due to wrong result from
+        hasOverhangingFloats.
+        https://bugs.webkit.org/show_bug.cgi?id=60537
+
+        * fast/block/float/no-overhanging-float-crash-expected.txt: Added.
+        * fast/block/float/no-overhanging-float-crash.html: Added.
+
 2011-05-10  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-10  Abhishek Arya  <inferno@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        Add containsFloats call to hasOverhangingFloats.
+        https://bugs.webkit.org/show_bug.cgi?id=60537
+
+        Test: fast/block/float/no-overhanging-float-crash.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::repaintOverhangingFloats):
+        * rendering/RenderBlock.h:
+        (WebCore::RenderBlock::hasOverhangingFloats):
+
 2011-05-10  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2218 +2218 @@
 {
     // Repaint any overhanging floats (if we know we're the one to paint them).
-    if (hasOverhangingFloats()) {
-        // We think that we must be in a bad state if m_floatingObjects is nil at this point, so 
-        // we assert on Debug builds and nil-check Release builds.
-        ASSERT(m_floatingObjects);
-        if (!m_floatingObjects)
-            return;
-
-        // FIXME: Avoid disabling LayoutState. At the very least, don't disable it for floats originating
-        // in this block. Better yet would be to push extra state for the containers of other floats.
-        view()->disableLayoutState();
-        FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
-        FloatingObjectSetIterator end = floatingObjectSet.end();
-        for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end; ++it) {
-            FloatingObject* r = *it;
-            // Only repaint the object if it is overhanging, is not in its own layer, and
-            // is our responsibility to paint (m_shouldPaint is set). When paintAllDescendants is true, the latter
-            // condition is replaced with being a descendant of us.
-            if (logicalBottomForFloat(r) > logicalHeight() && ((paintAllDescendants && r->m_renderer->isDescendantOf(this)) || r->m_shouldPaint) && !r->m_renderer->hasSelfPaintingLayer()) {
-                r->m_renderer->repaint();
-                r->m_renderer->repaintOverhangingFloats();
-            }
-        }
-        view()->enableLayoutState();
-    }
+    // Otherwise, bail out.
+    if (!hasOverhangingFloats())
+        return;
+
+    // FIXME: Avoid disabling LayoutState. At the very least, don't disable it for floats originating
+    // in this block. Better yet would be to push extra state for the containers of other floats.
+    view()->disableLayoutState();
+    FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
+    FloatingObjectSetIterator end = floatingObjectSet.end();
+    for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end; ++it) {
+        FloatingObject* r = *it;
+        // Only repaint the object if it is overhanging, is not in its own layer, and
+        // is our responsibility to paint (m_shouldPaint is set). When paintAllDescendants is true, the latter
+        // condition is replaced with being a descendant of us.
+        if (logicalBottomForFloat(r) > logicalHeight() && ((paintAllDescendants && r->m_renderer->isDescendantOf(this)) || r->m_shouldPaint) && !r->m_renderer->hasSelfPaintingLayer()) {
+            r->m_renderer->repaint();
+            r->m_renderer->repaintOverhangingFloats();
+        }
+    }
+    view()->enableLayoutState();
 }
  

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -569 +569 @@
     virtual bool avoidsFloats() const;
 
-    bool hasOverhangingFloats() { return parent() && !hasColumns() && lowestFloatLogicalBottom() > logicalHeight(); }
+    bool hasOverhangingFloats() { return parent() && !hasColumns() && containsFloats() && lowestFloatLogicalBottom() > logicalHeight(); }
     void addIntrudingFloats(RenderBlock* prev, int xoffset, int yoffset);
     int addOverhangingFloats(RenderBlock* child, int xoffset, int yoffset, bool makeChildPaintOtherFloats);