[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:52:23 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit ebcf4231bd8bb2e9f2706a7210623d5c70396fa2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 30 17:50:25 2009 +0000
2009-12-30 Dirk Schulze <krit at webkit.org>
Reviewed by Eric Seidel.
SVGResourceClipper needs to invalidate content
https://bugs.webkit.org/show_bug.cgi?id=33054
Added invalidate() to SVGResourceClipper to reset clipData
and drawing area after attribute changes.
This fixes two LayoutTests.
* svg/graphics/SVGResourceClipper.cpp:
(WebCore::SVGResourceClipper::resetClipData):
(WebCore::SVGResourceClipper::invalidate):
* svg/graphics/SVGResourceClipper.h:
2009-12-30 Dirk Schulze <krit at webkit.org>
Reviewed by Eric Seidel.
SVGResourceClipper needs to invalidate content
https://bugs.webkit.org/show_bug.cgi?id=33054
Drawing area should change after attribute changes in clipPath or
it's childs.
* platform/mac/svg/custom/clip-path-child-changes-expected.txt:
* platform/mac/svg/custom/clip-path-units-changes-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52665 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2c5a5f9..5637cca 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-30 Dirk Schulze <krit at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ SVGResourceClipper needs to invalidate content
+ https://bugs.webkit.org/show_bug.cgi?id=33054
+
+ Drawing area should change after attribute changes in clipPath or
+ it's childs.
+
+ * platform/mac/svg/custom/clip-path-child-changes-expected.txt:
+ * platform/mac/svg/custom/clip-path-units-changes-expected.txt:
+
2009-12-30 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Simon Hausmann.
diff --git a/LayoutTests/platform/mac/svg/custom/clip-path-child-changes-expected.txt b/LayoutTests/platform/mac/svg/custom/clip-path-child-changes-expected.txt
index 66cb406..54602fd 100644
--- a/LayoutTests/platform/mac/svg/custom/clip-path-child-changes-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/clip-path-child-changes-expected.txt
@@ -2,8 +2,8 @@ KCanvasResource {id="myclip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (0,0) size 200x200
+ RenderSVGRoot {svg} at (0,0) size 100x100
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (0,0) size 200x200 [clip path="myclip"]
+ RenderSVGContainer {g} at (0,0) size 100x100 [clip path="myclip"]
RenderPath {rect} at (0,0) size 200x200 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L200.00,0.00 L200.00,200.00 L0.00,200.00 Z"]
RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
diff --git a/LayoutTests/platform/mac/svg/custom/clip-path-units-changes-expected.txt b/LayoutTests/platform/mac/svg/custom/clip-path-units-changes-expected.txt
index 66cb406..54602fd 100644
--- a/LayoutTests/platform/mac/svg/custom/clip-path-units-changes-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/clip-path-units-changes-expected.txt
@@ -2,8 +2,8 @@ KCanvasResource {id="myclip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (0,0) size 200x200
+ RenderSVGRoot {svg} at (0,0) size 100x100
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (0,0) size 200x200 [clip path="myclip"]
+ RenderSVGContainer {g} at (0,0) size 100x100 [clip path="myclip"]
RenderPath {rect} at (0,0) size 200x200 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L200.00,0.00 L200.00,200.00 L0.00,200.00 Z"]
RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4320170..7122a62 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-30 Dirk Schulze <krit at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ SVGResourceClipper needs to invalidate content
+ https://bugs.webkit.org/show_bug.cgi?id=33054
+
+ Added invalidate() to SVGResourceClipper to reset clipData
+ and drawing area after attribute changes.
+
+ This fixes two LayoutTests.
+
+ * svg/graphics/SVGResourceClipper.cpp:
+ (WebCore::SVGResourceClipper::resetClipData):
+ (WebCore::SVGResourceClipper::invalidate):
+ * svg/graphics/SVGResourceClipper.h:
+
2009-12-30 Carol Szabo <carol.szabo at nokia.com>
Reviewed by Laszlo Gombos.
diff --git a/WebCore/svg/graphics/SVGResourceClipper.cpp b/WebCore/svg/graphics/SVGResourceClipper.cpp
index f267b14..c0fccaf 100644
--- a/WebCore/svg/graphics/SVGResourceClipper.cpp
+++ b/WebCore/svg/graphics/SVGResourceClipper.cpp
@@ -51,6 +51,13 @@ SVGResourceClipper::~SVGResourceClipper()
void SVGResourceClipper::resetClipData()
{
m_clipData.clear();
+ m_clipperBoundingBox = FloatRect();
+}
+
+void SVGResourceClipper::invalidate()
+{
+ SVGResource::invalidate();
+ resetClipData();
}
FloatRect SVGResourceClipper::clipperBoundingBox(const FloatRect& objectBoundingBox)
diff --git a/WebCore/svg/graphics/SVGResourceClipper.h b/WebCore/svg/graphics/SVGResourceClipper.h
index 5aa279f..df5562d 100644
--- a/WebCore/svg/graphics/SVGResourceClipper.h
+++ b/WebCore/svg/graphics/SVGResourceClipper.h
@@ -66,7 +66,9 @@ namespace WebCore {
public:
static PassRefPtr<SVGResourceClipper> create() { return adoptRef(new SVGResourceClipper); }
virtual ~SVGResourceClipper();
-
+
+ virtual void invalidate();
+
void resetClipData();
void addClipData(const Path&, WindRule, bool bboxUnits);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list