Changeset 109060 in webkit

Timestamp:

Feb 27, 2012 6:36:59 PM (12 years ago)

Author:

shawnsingh@chromium.org

Message:

RenderLayer ClipRect not accounting for transforms
​https://bugs.webkit.org/show_bug.cgi?id=76486

Reviewed by Simon Fraser.

Source/WebCore:

Test: compositing/layer-creation/overlap-transformed-and-clipped.html

This patch changes calculateClipRects() so that the clipRect
offset is allowed to be converted across layers with
transforms. This is necessary because the RenderLayerCompositor
needs clipRects in document space, rather than with respect to
some local clipping layer.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::localToContainerPoint):
(WebCore):

• rendering/RenderObject.h:

(RenderObject):

LayoutTests:

• compositing/layer-creation/overlap-transformed-and-clipped-expected.png: Added.
• compositing/layer-creation/overlap-transformed-and-clipped-expected.txt: Added.
• compositing/layer-creation/overlap-transformed-and-clipped.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.png (added)
• LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt (added)
• LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-27  Shawn Singh  <shawnsingh@chromium.org>
+
+        RenderLayer ClipRect not accounting for transforms
+        https://bugs.webkit.org/show_bug.cgi?id=76486
+
+        Reviewed by Simon Fraser.
+
+        * compositing/layer-creation/overlap-transformed-and-clipped-expected.png: Added.
+        * compositing/layer-creation/overlap-transformed-and-clipped-expected.txt: Added.
+        * compositing/layer-creation/overlap-transformed-and-clipped.html: Added.
+
 2012-02-27  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-27  Shawn Singh  <shawnsingh@chromium.org>
+
+        RenderLayer ClipRect not accounting for transforms
+        https://bugs.webkit.org/show_bug.cgi?id=76486
+
+        Reviewed by Simon Fraser.
+
+        Test: compositing/layer-creation/overlap-transformed-and-clipped.html
+
+        This patch changes calculateClipRects() so that the clipRect
+        offset is allowed to be converted across layers with
+        transforms. This is necessary because the RenderLayerCompositor
+        needs clipRects in document space, rather than with respect to
+        some local clipping layer.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::localToContainerPoint):
+        (WebCore):
+        * rendering/RenderObject.h:
+        (RenderObject):
+
 2012-02-27  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3654 +3654 @@
     if (renderer()->hasOverflowClip() || renderer()->hasClip()) {
         // This layer establishes a clip of some kind.
+
+        // This offset cannot use convertToLayerCoords, because sometimes our rootLayer may be across
+        // some transformed layer boundary, for example, in the RenderLayerCompositor overlapMap, where
+        // clipRects are needed in view space.
         LayoutPoint offset;
-        convertToLayerCoords(rootLayer, offset);
+        offset = roundedIntPoint(renderer()->localToContainerPoint(FloatPoint(), rootLayer->renderer()));
         RenderView* view = renderer()->view();
         ASSERT(view);

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2095 +2095 @@
 }
 
+FloatPoint RenderObject::localToContainerPoint(const FloatPoint& localPoint, RenderBoxModelObject* repaintContainer, bool fixed, bool* wasFixed) const
+{
+    TransformState transformState(TransformState::ApplyTransformDirection, localPoint);
+    mapLocalToContainer(repaintContainer, fixed, true, transformState, wasFixed);
+    transformState.flatten();
+
+    return transformState.lastPlanarPoint();
+}
+
 LayoutSize RenderObject::offsetFromContainer(RenderObject* o, const LayoutPoint& point) const
 {

trunk/Source/WebCore/rendering/RenderObject.h

@@ -645 +645 @@
         return localToContainerQuad(quad, 0, fixed, wasFixed);
     }
+
     // Convert a local quad into the coordinate system of container, taking transforms into account.
     FloatQuad localToContainerQuad(const FloatQuad&, RenderBoxModelObject* repaintContainer, bool fixed = false, bool* wasFixed = 0) const;
+    FloatPoint localToContainerPoint(const FloatPoint&, RenderBoxModelObject* repaintContainer, bool fixed = false, bool* wasFixed = 0) const;
 
     // Return the offset from the container() renderer (excluding transforms). In multi-column layout,