Changeset 94016 in webkit

Timestamp:

Aug 29, 2011 2:32:06 PM (13 years ago)

Author:

jchaffraix@webkit.org

Message:

Assertion failure in RenderLayer::computeRepaintRects when scrolling
​https://bugs.webkit.org/show_bug.cgi?id=67140

Reviewed by David Hyatt.

Source/WebCore:

Test: fast/repaint/scroll-fixed-layer-with-no-visible-content.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::computeRepaintRects): Fixed style after r93837.

(WebCore::RenderLayer::updateLayerPositionsAfterScroll): Tweaked the code
to bail early if our layer has no visible content. This avoids the ASSERT
and also makes sense as we shouldn't repaint / update empty layers.

LayoutTests:

This test checks that a fixed element with no visible content does not ASSERT and
renders properly.

• fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.txt: Added.
• fast/repaint/scroll-fixed-layer-with-no-visible-content.html: Added.
• platform/chromium-cg-mac/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png: Added.
• platform/chromium-win/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png: Added.
• platform/mac/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.txt (added)
• LayoutTests/fast/repaint/scroll-fixed-layer-with-no-visible-content.html (added)
• LayoutTests/platform/chromium-cg-mac/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png (added)
• LayoutTests/platform/chromium-win/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png (added)
• LayoutTests/platform/mac/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-29  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Assertion failure in RenderLayer::computeRepaintRects when scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=67140
+
+        Reviewed by David Hyatt.
+
+        This test checks that a fixed element with no visible content does not ASSERT and
+        renders properly.
+
+        * fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.txt: Added.
+        * fast/repaint/scroll-fixed-layer-with-no-visible-content.html: Added.
+        * platform/chromium-cg-mac/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png: Added.
+        * platform/chromium-win/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png: Added.
+        * platform/mac/fast/repaint/scroll-fixed-layer-with-no-visible-content-expected.png: Added.
+
 2011-08-29  Nayan Kumar K  <nayankk@motorola.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Assertion failure in RenderLayer::computeRepaintRects when scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=67140
+
+        Reviewed by David Hyatt.
+
+        Test: fast/repaint/scroll-fixed-layer-with-no-visible-content.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::computeRepaintRects): Fixed style after r93837.
+
+        (WebCore::RenderLayer::updateLayerPositionsAfterScroll): Tweaked the code
+        to bail early if our layer has no visible content. This avoids the ASSERT
+        and also makes sense as we shouldn't repaint / update empty layers.
+
 2011-08-29  Anna Cavender  <annacc@chromium.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -373 +373 @@
     ASSERT(!m_visibleContentStatusDirty);
 
-     RenderBoxModelObject* repaintContainer = renderer()->containerForRepaint();
-     m_repaintRect = renderer()->clippedOverflowRectForRepaint(repaintContainer);
+    RenderBoxModelObject* repaintContainer = renderer()->containerForRepaint();
+    m_repaintRect = renderer()->clippedOverflowRectForRepaint(repaintContainer);
     m_outlineBox = renderer()->outlineBoundsForRepaint(repaintContainer, cachedOffset);
 }
@@ -389 +389 @@
 void RenderLayer::updateLayerPositionsAfterScroll(bool fixed)
 {
+    ASSERT(!m_visibleContentStatusDirty);
+
+    // If we have no visible content, there is no point recomputing our rectangles as
+    // they will be empty. If our visibility changes, we are expected to recompute all
+    // our positions anyway.
+    if (!m_hasVisibleContent)
+        return;
+
     updateLayerPosition();