Changeset 73972 in webkit

Timestamp:

Dec 13, 2010 3:05:25 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=50963

Reviewed by Sam Weinig.

REGRESSION: Scrolling nested iframes is messed up on platforms that use the cross-platform ScrollView.

The selfClipRect and childrenClipRect methods of RenderLayer were incorrectly relying on the bounding box
of the root layer. This bounding box was only coincidentally incorporating overflow as part of the
RenderLayer's bounds. Since I fixed the RenderLayer bounds to not include layout overflow any longer,
this check is now exposed as incorrect. Use the entire document size when computing layer clip
rects.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::childrenClipRect):
(WebCore::RenderLayer::selfClipRect):

• rendering/RenderView.h:

(WebCore::RenderView::documentRect):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)
• rendering/RenderView.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=50963
+
+        REGRESSION: Scrolling nested iframes is messed up on platforms that use the cross-platform ScrollView.
+       
+        The selfClipRect and childrenClipRect methods of RenderLayer were incorrectly relying on the bounding box
+        of the root layer.  This bounding box was only coincidentally incorporating overflow as part of the 
+        RenderLayer's bounds.  Since I fixed the RenderLayer bounds to not include layout overflow any longer,
+        this check is now exposed as incorrect.  Use the entire document size  when computing layer clip
+        rects.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::childrenClipRect):
+        (WebCore::RenderLayer::selfClipRect):
+        * rendering/RenderView.h:
+        (WebCore::RenderView::documentRect):
+
 2010-12-13  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -3303 +3303 @@
 IntRect RenderLayer::childrenClipRect() const
 {
-    RenderLayer* rootLayer = renderer()->view()->layer();
+    RenderView* renderView = renderer()->view();
     RenderLayer* clippingRootLayer = clippingRoot();
     IntRect layerBounds, backgroundRect, foregroundRect, outlineRect;
-    calculateRects(clippingRootLayer, rootLayer->boundingBox(rootLayer), layerBounds, backgroundRect, foregroundRect, outlineRect);
+    calculateRects(clippingRootLayer, renderView->documentRect(), layerBounds, backgroundRect, foregroundRect, outlineRect);
     return clippingRootLayer->renderer()->localToAbsoluteQuad(FloatQuad(foregroundRect)).enclosingBoundingBox();
 }
@@ -3312 +3312 @@
 IntRect RenderLayer::selfClipRect() const
 {
-    RenderLayer* rootLayer = renderer()->view()->layer();
+    RenderView* renderView = renderer()->view();
     RenderLayer* clippingRootLayer = clippingRoot();
     IntRect layerBounds, backgroundRect, foregroundRect, outlineRect;
-    calculateRects(clippingRootLayer, rootLayer->boundingBox(rootLayer), layerBounds, backgroundRect, foregroundRect, outlineRect);
+    calculateRects(clippingRootLayer, renderView->documentRect(), layerBounds, backgroundRect, foregroundRect, outlineRect);
     return clippingRootLayer->renderer()->localToAbsoluteQuad(FloatQuad(backgroundRect)).enclosingBoundingBox();
 }

trunk/WebCore/rendering/RenderView.h

@@ -173 +173 @@
     int docRight() const;
     int docWidth() const { return docRight() - docLeft(); }
+    IntRect documentRect() const { return IntRect(docLeft(), docTop(), docWidth(), docHeight()); }
 
 protected: