Changeset 164336 in webkit

Timestamp:

Feb 18, 2014 5:55:33 PM (10 years ago)

Author:

Simon Fraser

Message:

border-box clip-paths jump around when outline changes
​https://bugs.webkit.org/show_bug.cgi?id=128929

Source/WebCore:

Reviewed by Dirk Schulze.

computeReferenceBox() for clip paths was using "rootRelativeBounds"
to position the border-box. This bounds is an enclosing bounds for
the layer and its descendants, including outlines and absolute descendants,
so it is not the correct box to use to offset the border-box.

The caller has offsetFromRoot(), which is the correct thing to use,
so use it.

Test: css3/masking/clip-path-root-relative-bounds.html

• rendering/RenderLayer.cpp:

(WebCore::computeReferenceBox):
(WebCore::RenderLayer::setupClipPath):

LayoutTests:

Reviewed by Dirk Schulze.

Test comparing a border-box clip path with and without an outline.

• css3/masking/clip-path-root-relative-bounds-expected.html: Added.
• css3/masking/clip-path-root-relative-bounds.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/masking/clip-path-root-relative-bounds-expected.html (added)
• LayoutTests/css3/masking/clip-path-root-relative-bounds.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-02-18  Simon Fraser  <simon.fraser@apple.com>
+
+        border-box clip-paths jump around when outline changes
+        https://bugs.webkit.org/show_bug.cgi?id=128929
+
+        Reviewed by Dirk Schulze.
+        
+        Test comparing a border-box clip path with and without an outline.
+
+        * css3/masking/clip-path-root-relative-bounds-expected.html: Added.
+        * css3/masking/clip-path-root-relative-bounds.html: Added.
+
 2014-02-18  James Craig  <jcraig@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-18  Simon Fraser  <simon.fraser@apple.com>
+
+        border-box clip-paths jump around when outline changes
+        https://bugs.webkit.org/show_bug.cgi?id=128929
+
+        Reviewed by Dirk Schulze.
+        
+        computeReferenceBox() for clip paths was using "rootRelativeBounds"
+        to position the border-box. This bounds is an enclosing bounds for
+        the layer and its descendants, including outlines and absolute descendants,
+        so it is not the correct box to use to offset the border-box.
+        
+        The caller has offsetFromRoot(), which is the correct thing to use,
+        so use it.
+
+        Test: css3/masking/clip-path-root-relative-bounds.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::computeReferenceBox):
+        (WebCore::RenderLayer::setupClipPath):
+
 2014-02-18  James Craig  <jcraig@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3789 +3789 @@
 
 template <class ReferenceBoxClipPathOperation>
-static inline LayoutRect computeReferenceBox(const RenderObject& renderer, const ReferenceBoxClipPathOperation& clippingPath, const LayoutRect& rootRelativeBounds)
+static inline LayoutRect computeReferenceBox(const RenderObject& renderer, const ReferenceBoxClipPathOperation& clippingPath, const LayoutPoint& offsetFromRoot, const LayoutRect& rootRelativeBounds)
 {
     LayoutRect referenceBox;
@@ -3797 +3797 @@
             case ContentBox:
                 referenceBox = box.contentBoxRect();
-                referenceBox.moveBy(rootRelativeBounds.location());
+                referenceBox.moveBy(offsetFromRoot);
                 break;
             case PaddingBox:
                 referenceBox = box.paddingBoxRect();
-                referenceBox.moveBy(rootRelativeBounds.location());
+                referenceBox.moveBy(offsetFromRoot);
                 break;
             // fill, stroke, view-box compute to border-box for HTML elements.
@@ -3809 +3809 @@
             case BorderBox:
                 referenceBox = box.borderBoxRect();
-                referenceBox.moveBy(rootRelativeBounds.location());
+                referenceBox.moveBy(offsetFromRoot);
                 break;
             case MarginBox:
@@ -3842 +3842 @@
         ShapeClipPathOperation& clippingPath = toShapeClipPathOperation(*(style.clipPath()));
 
-        LayoutRect referenceBox = computeReferenceBox(renderer(), clippingPath, rootRelativeBounds);
+        LayoutRect referenceBox = computeReferenceBox(renderer(), clippingPath, offsetFromRoot, rootRelativeBounds);
         context->save();
         context->clipPath(clippingPath.pathForReferenceRect(referenceBox), clippingPath.windRule());
@@ -3851 +3851 @@
         BoxClipPathOperation& clippingPath = toBoxClipPathOperation(*(style.clipPath()));
 
-        LayoutRect referenceBox = computeReferenceBox(renderer(), clippingPath, rootRelativeBounds);
+        LayoutRect referenceBox = computeReferenceBox(renderer(), clippingPath, offsetFromRoot, rootRelativeBounds);
         // FIXME This does not properly compute the rounded corners as specified in all conditions.
         // https://bugs.webkit.org/show_bug.cgi?id=127982