Changeset 85959 in webkit

Timestamp:

May 6, 2011 10:41:46 AM (13 years ago)

Author:

enne@google.com

Message:

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

Reviewed by James Robinson.

[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-05-04 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

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

Allow for empty scissor rects, which implies scissoring to the render
surface. The previous code and previous patch on this bug both didn't
take into account that the scissor rect should be the render surface
and not the projection of the layer itself, because child layers
aren't necessarily contained within the bounds of their superlayer.

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

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

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) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-04  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [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-05-05  Ojan Vafai  <ojan@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -4088 +4088 @@
 BUGWK60356 : svg/filters/subRegion-one-effect.svg = IMAGE
 BUGWK60356 : svg/filters/subRegion-two-effects.svg = IMAGE
+
+// Needs baselines everywhere
+BUGENNE GPU : compositing/flat-with-transformed-child.html = PASS FAIL MISSING

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-04  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Fix incorrect scissor rect for layers that render into a rendersurface
+        https://bugs.webkit.org/show_bug.cgi?id=59020
+
+        Allow for empty scissor rects, which implies scissoring to the render
+        surface. The previous code and previous patch on this bug both didn't
+        take into account that the scissor rect should be the render surface
+        and not the projection of the layer itself, because child layers
+        aren't necessarily contained within the bounds of their superlayer.
+
+        Test: compositing/flat-with-transformed-child.html
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::paintLayerContents):
+        (WebCore::LayerRendererChromium::updatePropertiesAndRenderSurfaces):
+        (WebCore::LayerRendererChromium::drawLayer):
+        (WebCore::LayerRendererChromium::setScissorToRect):
+
 2011-05-06  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -366 +366 @@
                 continue;
 
-            const IntRect targetSurfaceRect = layer->ccLayerImpl()->scissorRect();
+            IntRect targetSurfaceRect = ccLayerImpl->targetRenderSurface() ? ccLayerImpl->targetRenderSurface()->contentRect() : m_defaultRenderSurface->contentRect();
+            IntRect scissorRect = layer->ccLayerImpl()->scissorRect();
+            if (!scissorRect.isEmpty())
+                targetSurfaceRect.intersect(scissorRect);
 
             if (layer->drawsContent())
@@ -640 +643 @@
         layerOriginTransform.translate3d(-0.5 * bounds.width(), -0.5 * bounds.height(), 0);
         renderSurface->m_originTransform = layerOriginTransform;
-        if (layerOriginTransform.isInvertible() && drawLayer->superlayer()) {
-            TransformationMatrix parentToLayer = layerOriginTransform.inverse();
-
-            drawLayer->setScissorRect(parentToLayer.mapRect(drawLayer->superlayer()->scissorRect()));
-        } else
-            drawLayer->setScissorRect(IntRect());
+        drawLayer->setScissorRect(IntRect());
 
         // The render surface scissor rect is the scissor rect that needs to
@@ -685 +683 @@
 
         if (drawLayer->masksToBounds()) {
-            IntRect scissor = drawLayer->scissorRect();
-            scissor.intersect(transformedLayerRect);
+            IntRect scissor = transformedLayerRect;
+            if (!drawLayer->scissorRect().isEmpty())
+                scissor.intersect(drawLayer->scissorRect());
             drawLayer->setScissorRect(scissor);
         }
@@ -766 +765 @@
         // clipped.
         if (!drawLayer->replicaLayer()) {
-            renderSurface->m_contentRect.intersect(drawLayer->scissorRect());
+            if (!drawLayer->scissorRect().isEmpty())
+                renderSurface->m_contentRect.intersect(drawLayer->scissorRect());
             FloatPoint clippedSurfaceCenter = renderSurface->contentRectCenter();
             centerOffsetDueToClipping = clippedSurfaceCenter - surfaceCenter;
@@ -908 +908 @@
     setScissorToRect(layer->scissorRect());
 
+    IntRect targetSurfaceRect = m_currentRenderSurface ? m_currentRenderSurface->contentRect() : m_defaultRenderSurface->contentRect();
+    IntRect scissorRect = layer->scissorRect();
+    if (!scissorRect.isEmpty())
+        targetSurfaceRect.intersect(scissorRect);
+
     // Check if the layer falls within the visible bounds of the page.
     IntRect layerRect = layer->getDrawRect();
-    bool isLayerVisible = layer->scissorRect().intersects(layerRect);
+    bool isLayerVisible = targetSurfaceRect.intersects(layerRect);
     if (!isLayerVisible) {
         layer->unreserveContentsTexture();
@@ -934 +939 @@
     }
 
-    layer->draw(layer->scissorRect());
+    layer->draw(targetSurfaceRect);
 
     // Draw the debug border if there is one.
@@ -942 +947 @@
 // Sets the scissor region to the given rectangle. The coordinate system for the
 // scissorRect has its origin at the top left corner of the current visible rect.
-void LayerRendererChromium::setScissorToRect(const IntRect& scissorRect)
+void LayerRendererChromium::setScissorToRect(const IntRect& requestedScissor)
 {
     IntRect contentRect = (m_currentRenderSurface ? m_currentRenderSurface->m_contentRect : m_defaultRenderSurface->m_contentRect);
+
+    const IntRect scissorRect = requestedScissor.isEmpty() ? contentRect : requestedScissor;
 
     // The scissor coordinates must be supplied in viewport space so we need to offset