Changeset 91114 in webkit

Timestamp:

Jul 15, 2011 2:54:20 PM (13 years ago)

Author:

enne@google.com

Message:

Reviewed by Simon Fraser.

Overlap map for compositing needs to consider clipping
​https://bugs.webkit.org/show_bug.cgi?id=63493

Source/WebCore:

Test: compositing/layer-creation/overlap-clipping.html

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::addToOverlapMap):

• rendering/RenderLayerCompositor.h:

LayoutTests:

Added new test. limit-layer-bounds-clipping-ancestor had changed
behavior because some layers no longer needed to become composited.
Adjusted that test to be less platform-specific as well.

• compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt:
• compositing/geometry/limit-layer-bounds-clipping-ancestor.html:
• compositing/layer-creation/overlap-clipping-expected.txt: Added.
• compositing/layer-creation/overlap-clipping.html: Added.
• platform/chromium-gpu-mac/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt: Removed.
• platform/chromium-gpu/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt (modified) (3 diffs)
• LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor.html (modified) (1 diff)
• LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt (added)
• LayoutTests/compositing/layer-creation/overlap-clipping.html (added)
• LayoutTests/platform/chromium-gpu-mac/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt (deleted)
• LayoutTests/platform/chromium-gpu/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-27  Adrienne Walker  <enne@google.com>
+
+        Reviewed by Simon Fraser.
+
+        Overlap map for compositing needs to consider clipping
+        https://bugs.webkit.org/show_bug.cgi?id=63493
+
+        Added new test.  limit-layer-bounds-clipping-ancestor had changed
+        behavior because some layers no longer needed to become composited.
+        Adjusted that test to be less platform-specific as well.
+
+        * compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt:
+        * compositing/geometry/limit-layer-bounds-clipping-ancestor.html:
+        * compositing/layer-creation/overlap-clipping-expected.txt: Added.
+        * compositing/layer-creation/overlap-clipping.html: Added.
+        * platform/chromium-gpu-mac/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt: Removed.
+        * platform/chromium-gpu/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt: Removed.
+
 2011-07-15  Kenneth Russell  <kbr@google.com>
 

trunk/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt

@@ -10 +10 @@
     (GraphicsLayer
       (bounds 785.00 2618.00)
-      (children 9
+      (children 6
         (GraphicsLayer
           (position 21.00 21.00)
@@ -36 +36 @@
             (GraphicsLayer
               (position 5.00 145.00)
-              (bounds 68.00 28.00)
+              (bounds 144.00 24.00)
               (drawsContent 1)
             )
           )
-        )
-        (GraphicsLayer
-          (position 28.00 20.00)
-          (bounds 200.00 200.00)
-          (children 1
-            (GraphicsLayer
-              (position 5.00 2058.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 18.00 240.00)
-          (bounds 220.00 220.00)
-          (drawsContent 1)
         )
         (GraphicsLayer
@@ -72 +57 @@
             (GraphicsLayer
               (position 5.00 145.00)
-              (bounds 68.00 28.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 28.00 250.00)
-          (bounds 185.00 200.00)
-          (children 1
-            (GraphicsLayer
-              (position 5.00 2058.00)
+              (bounds 144.00 24.00)
               (drawsContent 1)
             )

trunk/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor.html

@@ -30 +30 @@
       width: 100px;
       height: 100px;
+    }
+
+    p {
+      font: 1em/1 Ahem, sans-serif;
     }
     

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-27  Adrienne Walker  <enne@google.com>
+
+        Reviewed by Simon Fraser.
+
+        Overlap map for compositing needs to consider clipping
+        https://bugs.webkit.org/show_bug.cgi?id=63493
+
+        Test: compositing/layer-creation/overlap-clipping.html
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::addToOverlapMap):
+        * rendering/RenderLayerCompositor.h:
+
 2011-07-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -567 +567 @@
     }
 
-    overlapMap.add(layer, layerBounds);
+    IntRect clipRect = layer->backgroundClipRect(rootRenderLayer(), true);
+    clipRect.intersect(layerBounds);
+    overlapMap.add(layer, clipRect);
 }
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -218 +218 @@
 
     typedef HashMap<RenderLayer*, IntRect> OverlapMap;
-    static void addToOverlapMap(OverlapMap&, RenderLayer*, IntRect& layerBounds, bool& boundsComputed);
+    void addToOverlapMap(OverlapMap&, RenderLayer*, IntRect& layerBounds, bool& boundsComputed);
     void addToOverlapMapRecursive(OverlapMap&, RenderLayer*);
     static bool overlapsCompositedLayers(OverlapMap&, const IntRect& layerBounds);