Changeset 117056 in webkit

Timestamp:

May 15, 2012 5:56:35 AM (12 years ago)

Author:

fmalita@chromium.org

Message:

Mask deformations when masked content is rotated
​https://bugs.webkit.org/show_bug.cgi?id=76527

Reviewed by Nikolas Zimmermann.

Source/WebCore:

Test: svg/repaint/mask-clip-target-transform.svg

RenderSVGResource::markForLayoutAndParentResourceInvalidation() needs to also
invalidate parent mask and clip resources, not just filters.

• rendering/svg/RenderSVGResource.cpp:

(WebCore::removeFromCacheAndInvalidateDependencies):
(WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):

LayoutTests:

• platform/chromium-linux/svg/repaint/mask-clip-target-transform-expected.png: Added.
• platform/chromium/test_expectations.txt:
• platform/mac/test_expectations.txt:
• svg/repaint/mask-clip-target-transform-expected.txt: Added.
• svg/repaint/mask-clip-target-transform.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-linux/svg/repaint/mask-clip-target-transform-expected.png (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/mac/test_expectations.txt (modified) (1 diff)
• LayoutTests/svg/repaint/mask-clip-target-transform-expected.txt (added)
• LayoutTests/svg/repaint/mask-clip-target-transform.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGResource.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-15  Florin Malita  <fmalita@chromium.org>
+
+        Mask deformations when masked content is rotated
+        https://bugs.webkit.org/show_bug.cgi?id=76527
+
+        Reviewed by Nikolas Zimmermann.
+
+        * platform/chromium-linux/svg/repaint/mask-clip-target-transform-expected.png: Added.
+        * platform/chromium/test_expectations.txt:
+        * platform/mac/test_expectations.txt:
+        * svg/repaint/mask-clip-target-transform-expected.txt: Added.
+        * svg/repaint/mask-clip-target-transform.svg: Added.
+
 2012-05-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -1219 +1219 @@
 BUGWK81217 : svg/hixie/perf/003.xml = PASS FAIL
 
+// Needs rebaselining after landing 76527
+BUGWK76527 WIN MAC : svg/repaint/mask-clip-target-transform.svg = IMAGE+TEXT IMAGE TEXT PASS
+
 BUGWK81240 MAC : svg/text/bidi-reorder-value-lists.svg = PASS IMAGE+TEXT
 

trunk/LayoutTests/platform/mac/test_expectations.txt

@@ -208 +208 @@
 BUGWK85990 : media/video-controls-toggling.html = TIMEOUT TEXT
 
+// Requires rebaseline after bug 76527
+BUGWK76527 : svg/repaint/mask-clip-target-transform.svg = IMAGE+TEXT IMAGE TEXT PASS
+
 BUGWK85308 : ietestcenter/css3/valuesandunits/units-000.htm = IMAGE
 BUGWK85310 : ietestcenter/css3/valuesandunits/units-010.htm = IMAGE

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-15  Florin Malita  <fmalita@chromium.org>
+
+        Mask deformations when masked content is rotated
+        https://bugs.webkit.org/show_bug.cgi?id=76527
+
+        Reviewed by Nikolas Zimmermann.
+
+        Test: svg/repaint/mask-clip-target-transform.svg
+
+        RenderSVGResource::markForLayoutAndParentResourceInvalidation() needs to also
+        invalidate parent mask and clip resources, not just filters.
+
+        * rendering/svg/RenderSVGResource.cpp:
+        (WebCore::removeFromCacheAndInvalidateDependencies):
+        (WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):
+
 2012-05-15  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp

@@ -28 +28 @@
 #include "Frame.h"
 #include "FrameView.h"
+#include "RenderSVGResourceClipper.h"
 #include "RenderSVGResourceContainer.h"
 #include "RenderSVGResourceFilter.h"
+#include "RenderSVGResourceMasker.h"
 #include "RenderSVGResourceSolidColor.h"
 #include "SVGResources.h"
@@ -162 +164 @@
 }
 
-static inline void removeFromFilterCacheAndInvalidateDependencies(RenderObject* object, bool needsLayout)
+static inline void removeFromCacheAndInvalidateDependencies(RenderObject* object, bool needsLayout)
 {
     ASSERT(object);
+    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object)) {
 #if ENABLE(FILTERS)
-    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object)) {
         if (RenderSVGResourceFilter* filter = resources->filter())
             filter->removeClientFromCache(object);
-    }
 #endif
+        if (RenderSVGResourceMasker* masker = resources->masker())
+            masker->removeClientFromCache(object);
+
+        if (RenderSVGResourceClipper* clipper = resources->clipper())
+            clipper->removeClientFromCache(object);
+    }
+
     if (!object->node() || !object->node()->isSVGElement())
         return;
@@ -192 +200 @@
         object->setNeedsLayout(true);
 
-    removeFromFilterCacheAndInvalidateDependencies(object, needsLayout);
+    removeFromCacheAndInvalidateDependencies(object, needsLayout);
 
     // Invalidate resources in ancestor chain, if needed.
     RenderObject* current = object->parent();
     while (current) {
-        removeFromFilterCacheAndInvalidateDependencies(current, needsLayout);
+        removeFromCacheAndInvalidateDependencies(current, needsLayout);
 
         if (current->isSVGResourceContainer()) {