Changeset 31805 in webkit

Timestamp:

Apr 11, 2008 12:00:15 AM (16 years ago)

Author:

rwlbuis@webkit.org

Message:

Reviewed by Eric.

​http://bugs.webkit.org/show_bug.cgi?id=18340
Elements with display="none" in a <clipPath> still contribute to clipping path

Skip elements in clip-path container that have display=none specified.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/clip-path-display-none-child-expected.checksum (added)
• LayoutTests/platform/mac/svg/custom/clip-path-display-none-child-expected.png (added)
• LayoutTests/platform/mac/svg/custom/clip-path-display-none-child-expected.txt (added)
• LayoutTests/svg/custom/clip-path-display-none-child.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGClipPathElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-04-11  Rob Buis  <buis@kde.org>
+
+        Reviewed by Eric.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=18340
+        Elements with display="none" in a <clipPath> still contribute to clipping path
+
+        * platform/mac/svg/custom/clip-path-display-none-child-expected.checksum: Added.
+        * platform/mac/svg/custom/clip-path-display-none-child-expected.png: Added.
+        * platform/mac/svg/custom/clip-path-display-none-child-expected.txt: Added.
+        * svg/custom/clip-path-display-none-child.svg: Added.
+
 2008-04-10  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-11  Rob Buis  <buis@kde.org>
+
+        Reviewed by Eric.
+
+        http://bugs.webkit.org/show_bug.cgi?id=18340
+        Elements with display="none" in a <clipPath> still contribute to clipping path
+
+        Skip elements in clip-path container that have display=none specified.
+
+        * svg/SVGClipPathElement.cpp:
+        (WebCore::SVGClipPathElement::canvasResource):
+
 2008-04-10  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/svg/SVGClipPathElement.cpp

@@ -1 +1 @@
 /*
     Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
-                  2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
@@ -106 +106 @@
             SVGStyledTransformableElement* styled = static_cast<SVGStyledTransformableElement*>(n);
             RenderStyle* pathStyle = document()->styleSelector()->styleForElement(styled, clipPathStyle);
-            Path pathData = styled->toClipPath();
-            // FIXME: How do we know the element has done a layout?
-            pathData.transform(styled->animatedLocalTransform());
-            if (!pathData.isEmpty())
-                m_clipper->addClipData(pathData, pathStyle->svgStyle()->clipRule(), bbox);
+            if (pathStyle->display() != NONE) {
+                Path pathData = styled->toClipPath();
+                // FIXME: How do we know the element has done a layout?
+                pathData.transform(styled->animatedLocalTransform());
+                if (!pathData.isEmpty())
+                    m_clipper->addClipData(pathData, pathStyle->svgStyle()->clipRule(), bbox);
+            }
             pathStyle->deref(document()->renderArena());
         }