Changeset 52709 in webkit

Timestamp:

Jan 4, 2010 12:21:52 AM (14 years ago)

Author:

krit@webkit.org

Message:

2010-01-03 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

SVGResources don't invalidate if target object changes attributes
​https://bugs.webkit.org/show_bug.cgi?id=33091

It's neccessary to invalidate all resources of an object, if the attributes of this
target change. Otherwise the saved resource data (like ImageBuffers) don't match
to the new object properties.

Test: svg/custom/resource-invalidate-on-target-update.svg

• svg/SVGStyledElement.cpp: (WebCore::SVGStyledElement::svgAttributeChanged): (WebCore::SVGStyledElement::invalidateResources):
• svg/SVGStyledElement.h:

2010-01-03 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

SVGResources don't invalidate if target object changes attributes
​https://bugs.webkit.org/show_bug.cgi?id=33091

Check if SVG resources are invalidated, if target object changes
attributes.

• platform/mac/svg/custom/resource-invalidate-on-target-update-expected.checksum: Added.
• platform/mac/svg/custom/resource-invalidate-on-target-update-expected.png: Added.
• platform/mac/svg/custom/resource-invalidate-on-target-update-expected.txt: Added.
• svg/custom/resource-invalidate-on-target-update.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/resource-invalidate-on-target-update-expected.checksum (added)
• LayoutTests/platform/mac/svg/custom/resource-invalidate-on-target-update-expected.png (added)
• LayoutTests/platform/mac/svg/custom/resource-invalidate-on-target-update-expected.txt (added)
• LayoutTests/svg/custom/resource-invalidate-on-target-update.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGStyledElement.cpp (modified) (2 diffs)
• WebCore/svg/SVGStyledElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-04  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        SVGResources don't invalidate if target object changes attributes
+        https://bugs.webkit.org/show_bug.cgi?id=33091
+
+        Check if SVG resources are invalidated, if target object changes
+        attributes.
+
+        * platform/mac/svg/custom/resource-invalidate-on-target-update-expected.checksum: Added.
+        * platform/mac/svg/custom/resource-invalidate-on-target-update-expected.png: Added.
+        * platform/mac/svg/custom/resource-invalidate-on-target-update-expected.txt: Added.
+        * svg/custom/resource-invalidate-on-target-update.svg: Added.
+
 2010-01-03  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-04  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        SVGResources don't invalidate if target object changes attributes
+        https://bugs.webkit.org/show_bug.cgi?id=33091
+
+        It's neccessary to invalidate all resources of an object, if the attributes of this
+        target change. Otherwise the saved resource data (like ImageBuffers) don't match
+        to the new object properties. 
+
+        Test: svg/custom/resource-invalidate-on-target-update.svg
+
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::svgAttributeChanged):
+        (WebCore::SVGStyledElement::invalidateResources):
+        * svg/SVGStyledElement.h:
+
 2010-01-03  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/svg/SVGStyledElement.cpp

@@ -37 +37 @@
 #include "SVGNames.h"
 #include "SVGRenderStyle.h"
-#include "SVGResource.h"
+#include "SVGResourceClipper.h"
+#include "SVGResourceFilter.h"
+#include "SVGResourceMasker.h"
 #include "SVGSVGElement.h"
 #include <wtf/Assertions.h>
@@ -203 +205 @@
     invalidateResourcesInAncestorChain();
 
+    // If the element is using resources, invalidate them.
+    invalidateResources();
+
     // Invalidate all SVGElementInstances associated with us
     SVGElementInstance::invalidateAllInstancesOfElement(this);
+}
+
+void SVGStyledElement::invalidateResources()
+{
+    RenderObject* object = renderer();
+    if (!object)
+        return;
+
+    const SVGRenderStyle* svgStyle = object->style()->svgStyle();
+    Document* document = this->document();
+
+    if (document->parsing())
+        return; 
+
+#if ENABLE(FILTERS)
+    SVGResourceFilter* filter = getFilterById(document, svgStyle->filter(), object);
+    if (filter)
+        filter->invalidate();
+#endif
+
+    SVGResourceMasker* masker = getMaskerById(document, svgStyle->maskElement(), object);
+    if (masker)
+        masker->invalidate();
+
+    SVGResourceClipper* clipper = getClipperById(document, svgStyle->clipPath(), object);
+    if (clipper)
+        clipper->invalidate();
 }
 

trunk/WebCore/svg/SVGStyledElement.h

@@ -61 +61 @@
         PassRefPtr<RenderStyle> resolveStyle(RenderStyle* parentStyle);
 
-        void invalidateResourcesInAncestorChain() const;        
+        void invalidateResourcesInAncestorChain() const;
+        void invalidateResources();
+
         virtual void detach();