Changeset 185851 in webkit

Timestamp:

Jun 22, 2015 4:32:30 PM (9 years ago)

Author:

Simon Fraser

Message:

-webkit-clip-path clips incorrectly if the element bounds go beyond the top edge of the page
​https://bugs.webkit.org/show_bug.cgi?id=146218
rdar://problem/21127840

Reviewed by Zalan Bujtas.
Source/WebCore:

The clip path is computed using the RenderLayer's bounding box, so needs to be offset
by the offsetFromRenderer when set on the mask layer.

Test: compositing/masks/compositing-clip-path-origin.html

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateMaskingLayerGeometry):

LayoutTests:

Test clip path on layers with non-zero bounds offsetFromRenderer because of box shadow,
or vertical writing mode.

• compositing/masks/compositing-clip-path-origin-expected.html: Added.
• compositing/masks/compositing-clip-path-origin.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/masks/compositing-clip-path-origin-expected.html (added)
• LayoutTests/compositing/masks/compositing-clip-path-origin.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-06-22  Simon Fraser  <simon.fraser@apple.com>
+
+        -webkit-clip-path clips incorrectly if the element bounds go beyond the top edge of the page
+        https://bugs.webkit.org/show_bug.cgi?id=146218
+        rdar://problem/21127840
+
+        Reviewed by Zalan Bujtas.
+        
+        Test clip path on layers with non-zero bounds offsetFromRenderer because of box shadow,
+        or vertical writing mode.
+
+        * compositing/masks/compositing-clip-path-origin-expected.html: Added.
+        * compositing/masks/compositing-clip-path-origin.html: Added.
+
 2015-06-22  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-22  Simon Fraser  <simon.fraser@apple.com>
+
+        -webkit-clip-path clips incorrectly if the element bounds go beyond the top edge of the page
+        https://bugs.webkit.org/show_bug.cgi?id=146218
+        rdar://problem/21127840
+
+        Reviewed by Zalan Bujtas.
+
+        The clip path is computed using the RenderLayer's bounding box, so needs to be offset
+        by the offsetFromRenderer when set on the mask layer.
+
+        Test: compositing/masks/compositing-clip-path-origin.html
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateMaskingLayerGeometry):
+
 2015-06-22  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1062 +1062 @@
             Path clipPath = m_owningLayer.computeClipPath(offset, referenceBoxForClippedInline, windRule);
 
+            FloatSize pathOffset = m_maskLayer->offsetFromRenderer();
+            if (!pathOffset.isZero())
+                clipPath.translate(-pathOffset);
+            
             m_maskLayer->setShapeLayerPath(clipPath);
             m_maskLayer->setShapeLayerWindRule(windRule);