Changeset 85075 in webkit

Timestamp:

Apr 27, 2011 1:21:11 PM (13 years ago)

Author:

enne@google.com

Message:

2011-04-20 Adrienne Walker <​enne@google.com>

Reviewed by Kenneth Russell.

[chromium] Fix incorrect scissor rect for layers that render into a rendersurface
​https://bugs.webkit.org/show_bug.cgi?id=59020

• compositing/flat-with-transformed-child-expected.txt: Added.
• compositing/flat-with-transformed-child.html: Added.
• platform/chromium-gpu-linux/compositing/flat-with-transformed-child-expected.checksum: Added.
• platform/chromium-gpu-linux/compositing/flat-with-transformed-child-expected.png: Added.
• platform/chromium/test_expectations.txt:

2011-04-20 Adrienne Walker <​enne@google.com>

Reviewed by Kenneth Russell.

[chromium] Fix incorrect scissor rect for layers that render into a rendersurface
​https://bugs.webkit.org/show_bug.cgi?id=59020

mapRect is the incorrect transform here. The parent scissor rect
needs to be projected into layer space instead.

Test: compositing/flat-with-transformed-child.html

• platform/graphics/chromium/LayerRendererChromium.cpp: (WebCore::LayerRendererChromium::updatePropertiesAndRenderSurfaces):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/flat-with-transformed-child-expected.txt (added)
• LayoutTests/compositing/flat-with-transformed-child.html (added)
• LayoutTests/platform/chromium-gpu-linux/compositing/flat-with-transformed-child-expected.checksum (added)
• LayoutTests/platform/chromium-gpu-linux/compositing/flat-with-transformed-child-expected.png (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-20  Adrienne Walker  <enne@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Fix incorrect scissor rect for layers that render into a rendersurface
+        https://bugs.webkit.org/show_bug.cgi?id=59020
+
+        * compositing/flat-with-transformed-child-expected.txt: Added.
+        * compositing/flat-with-transformed-child.html: Added.
+        * platform/chromium-gpu-linux/compositing/flat-with-transformed-child-expected.checksum: Added.
+        * platform/chromium-gpu-linux/compositing/flat-with-transformed-child-expected.png: Added.
+        * platform/chromium/test_expectations.txt:
+
 2011-04-27  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3968 +3968 @@
 BUGDPRANKE WIN LINUX : media/video-controls-transformed.html = TEXT
 BUGDPRANKE MAC CPU : media/video-controls-transformed.html = TEXT
+
+// Needs baselines everywhere
+BUGENNE : compositing/flat-with-transformed-child.html = FAIL

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-20  Adrienne Walker  <enne@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Fix incorrect scissor rect for layers that render into a rendersurface
+        https://bugs.webkit.org/show_bug.cgi?id=59020
+
+        mapRect is the incorrect transform here.  The parent scissor rect
+        needs to be projected into layer space instead.
+
+        Test: compositing/flat-with-transformed-child.html
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::updatePropertiesAndRenderSurfaces):
+
 2011-04-27  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

@@ -629 +629 @@
         renderSurface->m_originTransform = layerOriginTransform;
         if (layerOriginTransform.isInvertible() && drawLayer->superlayer()) {
+            // Transform parent scissor rect into the space of the layer.
+            IntRect parentScissor = drawLayer->superlayer()->scissorRect();
+            parentScissor.intersect(layerOriginTransform.mapRect(transformedLayerRect));
             TransformationMatrix parentToLayer = layerOriginTransform.inverse();
-
-            drawLayer->setScissorRect(parentToLayer.mapRect(drawLayer->superlayer()->scissorRect()));
+            IntRect scissor = parentToLayer.projectQuad(FloatQuad(FloatRect(parentScissor))).enclosingBoundingBox();
+            scissor.intersect(transformedLayerRect);
+            drawLayer->setScissorRect(scissor);
         } else
             drawLayer->setScissorRect(IntRect());