[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 13:03:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7f256235c7b1cc880f1ade3bef6721a78abae380
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 6 15:01:34 2010 +0000
Unreviewed, rolling out r66823.
http://trac.webkit.org/changeset/66823
https://bugs.webkit.org/show_bug.cgi?id=45266
Patch by Sheriff Bot <webkit.review.bot at gmail.com> on 2010-09-06
Windows build fails with unknown reason (Requested by zherczeg
on #webkit).
WebCore:
* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderObject.h:
* rendering/RenderSVGResourceFilterPrimitive.cpp: Removed.
* rendering/RenderSVGResourceFilterPrimitive.h: Removed.
* rendering/SVGRenderTreeAsText.cpp:
(WebCore::writeSVGContainer):
* svg/SVGFEDiffuseLightingElement.cpp:
(WebCore::SVGFEDiffuseLightingElement::svgAttributeChanged):
* svg/SVGFELightElement.cpp:
(WebCore::SVGFELightElement::svgAttributeChanged):
(WebCore::SVGFELightElement::childrenChanged):
* svg/SVGFEOffsetElement.cpp:
(WebCore::SVGFEOffsetElement::svgAttributeChanged):
* svg/SVGFilterElement.h:
(WebCore::SVGFilterElement::invalidateFilter):
* svg/SVGFilterPrimitiveStandardAttributes.cpp:
(WebCore::SVGFilterPrimitiveStandardAttributes::svgAttributeChanged):
(WebCore::SVGFilterPrimitiveStandardAttributes::childrenChanged):
* svg/SVGFilterPrimitiveStandardAttributes.h:
(WebCore::SVGFilterPrimitiveStandardAttributes::rendererIsNeeded):
LayoutTests:
* platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.checksum:
* platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66830 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 40cda39..6fe94d7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-06 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r66823.
+ http://trac.webkit.org/changeset/66823
+ https://bugs.webkit.org/show_bug.cgi?id=45266
+
+ Windows build fails with unknown reason (Requested by zherczeg
+ on #webkit).
+
+ * platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.checksum:
+ * platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png:
+
2010-09-06 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.checksum
index b108a27..097ff26 100644
--- a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.checksum
+++ b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.checksum
@@ -1 +1 @@
-b843a316e79ec04f5744a15d667492da
\ No newline at end of file
+d53a2e4153d3748984be458e53e813f2
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png
index dfc805b..34b12ca 100644
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png and b/LayoutTests/platform/mac/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png differ
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 4097823..21d1b0d 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -657,7 +657,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
rendering/RenderSVGResourceClipper.cpp \
rendering/RenderSVGResourceContainer.cpp \
rendering/RenderSVGResourceFilter.cpp \
- rendering/RenderSVGResourceFilterPrimitive.cpp \
rendering/RenderSVGResourceGradient.cpp \
rendering/RenderSVGResourceLinearGradient.cpp \
rendering/RenderSVGResourceMarker.cpp \
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index a933a92..1d9159f 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1615,7 +1615,6 @@ IF (ENABLE_SVG)
rendering/RenderSVGResourceClipper.cpp
rendering/RenderSVGResourceContainer.cpp
rendering/RenderSVGResourceFilter.cpp
- rendering/RenderSVGResourceFilterPrimitive.cpp
rendering/RenderSVGResourceGradient.cpp
rendering/RenderSVGResourceLinearGradient.cpp
rendering/RenderSVGResourceMarker.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 966d1f6..ffea0e4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,39 @@
+2010-09-06 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r66823.
+ http://trac.webkit.org/changeset/66823
+ https://bugs.webkit.org/show_bug.cgi?id=45266
+
+ Windows build fails with unknown reason (Requested by zherczeg
+ on #webkit).
+
+ * Android.mk:
+ * CMakeLists.txt:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * rendering/RenderObject.h:
+ * rendering/RenderSVGResourceFilterPrimitive.cpp: Removed.
+ * rendering/RenderSVGResourceFilterPrimitive.h: Removed.
+ * rendering/SVGRenderTreeAsText.cpp:
+ (WebCore::writeSVGContainer):
+ * svg/SVGFEDiffuseLightingElement.cpp:
+ (WebCore::SVGFEDiffuseLightingElement::svgAttributeChanged):
+ * svg/SVGFELightElement.cpp:
+ (WebCore::SVGFELightElement::svgAttributeChanged):
+ (WebCore::SVGFELightElement::childrenChanged):
+ * svg/SVGFEOffsetElement.cpp:
+ (WebCore::SVGFEOffsetElement::svgAttributeChanged):
+ * svg/SVGFilterElement.h:
+ (WebCore::SVGFilterElement::invalidateFilter):
+ * svg/SVGFilterPrimitiveStandardAttributes.cpp:
+ (WebCore::SVGFilterPrimitiveStandardAttributes::svgAttributeChanged):
+ (WebCore::SVGFilterPrimitiveStandardAttributes::childrenChanged):
+ * svg/SVGFilterPrimitiveStandardAttributes.h:
+ (WebCore::SVGFilterPrimitiveStandardAttributes::rendererIsNeeded):
+
2010-09-06 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index e815dec..d361810 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3903,8 +3903,6 @@ webcore_sources += \
WebCore/rendering/RenderSVGResourceClipper.h \
WebCore/rendering/RenderSVGResourceFilter.cpp \
WebCore/rendering/RenderSVGResourceFilter.h \
- WebCore/rendering/RenderSVGResourceFilterPrimitive.cpp \
- WebCore/rendering/RenderSVGResourceFilterPrimitive.h \
WebCore/rendering/RenderSVGResourceGradient.cpp \
WebCore/rendering/RenderSVGResourceGradient.h \
WebCore/rendering/RenderSVGResourceLinearGradient.cpp \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 4b76a2a..3321cbb 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -3462,8 +3462,6 @@
'rendering/RenderSVGResourceContainer.h',
'rendering/RenderSVGResourceFilter.cpp',
'rendering/RenderSVGResourceFilter.h',
- 'rendering/RenderSVGResourceFilterPrimitive.cpp',
- 'rendering/RenderSVGResourceFilterPrimitive.h',
'rendering/RenderSVGResourceGradient.cpp',
'rendering/RenderSVGResourceGradient.h',
'rendering/RenderSVGResourceLinearGradient.cpp',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 688ddde..3f23cdd 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1906,7 +1906,6 @@ HEADERS += \
rendering/RenderSVGResourceClipper.h \
rendering/RenderSVGResourceContainer.h \
rendering/RenderSVGResourceFilter.h \
- rendering/RenderSVGResourceFilterPrimitive.h \
rendering/RenderSVGResourceGradient.h \
rendering/RenderSVGResourceLinearGradient.h \
rendering/RenderSVGResourceMarker.h \
@@ -3053,7 +3052,6 @@ contains(DEFINES, ENABLE_SVG=1) {
rendering/RenderSVGResourceClipper.cpp \
rendering/RenderSVGResourceContainer.cpp \
rendering/RenderSVGResourceFilter.cpp \
- rendering/RenderSVGResourceFilterPrimitive.cpp \
rendering/RenderSVGResourceGradient.cpp \
rendering/RenderSVGResourceLinearGradient.cpp \
rendering/RenderSVGResourceMarker.cpp \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index c931ddc..f3e49f5 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -30957,62 +30957,6 @@
>
</File>
<File
- RelativePath="..\rendering\RenderSVGResourceFilterPrimitive.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\RenderSVGResourceFilterPrimitive.h"
- >
- </File>
- <File
RelativePath="..\rendering\RenderSVGResourceGradient.cpp"
>
<FileConfiguration
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 61c2d81..c8b88ec 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -324,8 +324,6 @@
18F831B80FD48C7800D8C56B /* WorkerLoaderProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 18F831B70FD48C7800D8C56B /* WorkerLoaderProxy.h */; };
1921327411C0E6BB00456238 /* SVGFEConvolveMatrixElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1921327111C0E6BB00456238 /* SVGFEConvolveMatrixElement.cpp */; };
1921327511C0E6BB00456238 /* SVGFEConvolveMatrixElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1921327211C0E6BB00456238 /* SVGFEConvolveMatrixElement.h */; };
- 19423B501234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19423B4E1234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.cpp */; };
- 19423B511234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.h in Headers */ = {isa = PBXBuildFile; fileRef = 19423B4F1234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.h */; };
19BFF64B11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 19BFF64611C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.h */; };
19BFF64C11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 19BFF64711C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.mm */; };
19BFF64D11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 19BFF64811C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h */; };
@@ -6138,8 +6136,6 @@
1921327111C0E6BB00456238 /* SVGFEConvolveMatrixElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEConvolveMatrixElement.cpp; sourceTree = "<group>"; };
1921327211C0E6BB00456238 /* SVGFEConvolveMatrixElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGFEConvolveMatrixElement.h; sourceTree = "<group>"; };
1921327311C0E6BB00456238 /* SVGFEConvolveMatrixElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGFEConvolveMatrixElement.idl; sourceTree = "<group>"; };
- 19423B4E1234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResourceFilterPrimitive.cpp; sourceTree = "<group>"; };
- 19423B4F1234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourceFilterPrimitive.h; sourceTree = "<group>"; };
19BFF64611C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGFEConvolveMatrixElement.h; sourceTree = "<group>"; };
19BFF64711C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGFEConvolveMatrixElement.mm; sourceTree = "<group>"; };
19BFF64811C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGFEConvolveMatrixElementInternal.h; sourceTree = "<group>"; };
@@ -17249,8 +17245,6 @@
08082372117987C100241DE8 /* RenderSVGResourceContainer.h */,
841FDC241178C9BE00F8AC9B /* RenderSVGResourceFilter.cpp */,
841FDC251178C9BE00F8AC9B /* RenderSVGResourceFilter.h */,
- 19423B4E1234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.cpp */,
- 19423B4F1234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.h */,
08C34AF11179C056002D7456 /* RenderSVGResourceGradient.cpp */,
08C34AF21179C057002D7456 /* RenderSVGResourceGradient.h */,
08C34AF31179C057002D7456 /* RenderSVGResourceLinearGradient.cpp */,
@@ -19729,7 +19723,6 @@
84BDA16C11358D2A00DBF64C /* RenderSVGResourceClipper.h in Headers */,
08082373117987C100241DE8 /* RenderSVGResourceContainer.h in Headers */,
841FDC271178C9BE00F8AC9B /* RenderSVGResourceFilter.h in Headers */,
- 19423B511234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.h in Headers */,
08C34AF61179C057002D7456 /* RenderSVGResourceGradient.h in Headers */,
08C34AF81179C057002D7456 /* RenderSVGResourceLinearGradient.h in Headers */,
8499A515115FB33000F566E3 /* RenderSVGResourceMarker.h in Headers */,
@@ -22284,7 +22277,6 @@
84BDA16B11358D2A00DBF64C /* RenderSVGResourceClipper.cpp in Sources */,
086A400611F6D6B7002CEC53 /* RenderSVGResourceContainer.cpp in Sources */,
841FDC261178C9BE00F8AC9B /* RenderSVGResourceFilter.cpp in Sources */,
- 19423B501234E86B00D1EE9E /* RenderSVGResourceFilterPrimitive.cpp in Sources */,
08C34AF51179C057002D7456 /* RenderSVGResourceGradient.cpp in Sources */,
08C34AF71179C057002D7456 /* RenderSVGResourceLinearGradient.cpp in Sources */,
8499A514115FB33000F566E3 /* RenderSVGResourceMarker.cpp in Sources */,
diff --git a/WebCore/rendering/RenderObject.h b/WebCore/rendering/RenderObject.h
index c369db8..b8aa8a9 100644
--- a/WebCore/rendering/RenderObject.h
+++ b/WebCore/rendering/RenderObject.h
@@ -320,7 +320,6 @@ public:
virtual bool isSVGImage() const { return false; }
virtual bool isSVGForeignObject() const { return false; }
virtual bool isSVGResourceContainer() const { return false; }
- virtual bool isSVGResourceFilterPrimitive() const { return false; }
virtual bool isSVGShadowTreeRootContainer() const { return false; }
virtual RenderSVGResourceContainer* toRenderSVGResourceContainer();
diff --git a/WebCore/rendering/RenderSVGResourceFilterPrimitive.cpp b/WebCore/rendering/RenderSVGResourceFilterPrimitive.cpp
deleted file mode 100644
index f7381fa..0000000
--- a/WebCore/rendering/RenderSVGResourceFilterPrimitive.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 University of Szeged
- * Copyright (C) 2010 Zoltan Herczeg
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(SVG) && ENABLE(FILTERS)
-#include "RenderSVGResourceFilterPrimitive.h"
-
-namespace WebCore {
-
-RenderSVGResourceFilterPrimitive::RenderSVGResourceFilterPrimitive(SVGFilterPrimitiveStandardAttributes* filterPrimitiveElement)
- : RenderSVGHiddenContainer(filterPrimitiveElement)
-{
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/rendering/RenderSVGResourceFilterPrimitive.h b/WebCore/rendering/RenderSVGResourceFilterPrimitive.h
deleted file mode 100644
index 96e2c5e..0000000
--- a/WebCore/rendering/RenderSVGResourceFilterPrimitive.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010 University of Szeged
- * Copyright (C) 2010 Zoltan Herczeg
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RenderSVGResourceFilterPrimitive_h
-#define RenderSVGResourceFilterPrimitive_h
-
-#if ENABLE(SVG) && ENABLE(FILTERS)
-
-#include "RenderSVGHiddenContainer.h"
-#include "SVGFilterPrimitiveStandardAttributes.h"
-
-namespace WebCore {
-
-class RenderSVGResourceFilterPrimitive : public RenderSVGHiddenContainer {
-public:
- RenderSVGResourceFilterPrimitive(SVGFilterPrimitiveStandardAttributes* filterPrimitiveElement);
-
-private:
- virtual bool isSVGResourceFilterPrimitive() const { return true; }
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SVG) && ENABLE(FILTERS)
-
-#endif // RenderSVGResourceFilterPrimitive_h
diff --git a/WebCore/rendering/SVGRenderTreeAsText.cpp b/WebCore/rendering/SVGRenderTreeAsText.cpp
index 20d7220..0c9b7e1 100644
--- a/WebCore/rendering/SVGRenderTreeAsText.cpp
+++ b/WebCore/rendering/SVGRenderTreeAsText.cpp
@@ -676,9 +676,6 @@ void writeSVGResourceContainer(TextStream& ts, const RenderObject& object, int i
void writeSVGContainer(TextStream& ts, const RenderObject& container, int indent)
{
- // Currently RenderSVGResourceFilterPrimitive has no meaningful output.
- if (container.isSVGResourceFilterPrimitive())
- return;
writeStandardPrefix(ts, container, indent);
writePositionAndStyle(ts, container);
ts << "\n";
diff --git a/WebCore/svg/SVGFEDiffuseLightingElement.cpp b/WebCore/svg/SVGFEDiffuseLightingElement.cpp
index 4349f27..8c7e7ed 100644
--- a/WebCore/svg/SVGFEDiffuseLightingElement.cpp
+++ b/WebCore/svg/SVGFEDiffuseLightingElement.cpp
@@ -75,7 +75,7 @@ void SVGFEDiffuseLightingElement::svgAttributeChanged(const QualifiedName& attrN
|| attrName == SVGNames::diffuseConstantAttr
|| attrName == SVGNames::kernelUnitLengthAttr
|| attrName == SVGNames::lighting_colorAttr)
- invalidate();
+ SVGFilterElement::invalidateFilter(this);
}
void SVGFEDiffuseLightingElement::synchronizeProperty(const QualifiedName& attrName)
diff --git a/WebCore/svg/SVGFELightElement.cpp b/WebCore/svg/SVGFELightElement.cpp
index 61d7df0..dc10cf9 100644
--- a/WebCore/svg/SVGFELightElement.cpp
+++ b/WebCore/svg/SVGFELightElement.cpp
@@ -25,7 +25,6 @@
#include "SVGFELightElement.h"
#include "Attribute.h"
-#include "RenderSVGResource.h"
#include "SVGFilterElement.h"
#include "SVGNames.h"
@@ -77,13 +76,8 @@ void SVGFELightElement::svgAttributeChanged(const QualifiedName& attrName)
|| attrName == SVGNames::pointsAtYAttr
|| attrName == SVGNames::pointsAtZAttr
|| attrName == SVGNames::specularExponentAttr
- || attrName == SVGNames::limitingConeAngleAttr) {
- if (Node* parentNode = parent()) {
- RenderObject* renderer = parentNode->renderer();
- if (renderer && renderer->isSVGResourceFilterPrimitive())
- RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
- }
- }
+ || attrName == SVGNames::limitingConeAngleAttr)
+ SVGFilterElement::invalidateFilter(this);
}
void SVGFELightElement::synchronizeProperty(const QualifiedName& attrName)
@@ -130,13 +124,8 @@ void SVGFELightElement::childrenChanged(bool changedByParser, Node* beforeChange
{
SVGElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
- if (!changedByParser) {
- if (Node* parentNode = parent()) {
- RenderObject* renderer = parentNode->renderer();
- if (renderer && renderer->isSVGResourceFilterPrimitive())
- RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
- }
- }
+ if (!changedByParser)
+ SVGFilterElement::invalidateFilter(this);
}
}
diff --git a/WebCore/svg/SVGFEOffsetElement.cpp b/WebCore/svg/SVGFEOffsetElement.cpp
index 58b4a6a..b27db31 100644
--- a/WebCore/svg/SVGFEOffsetElement.cpp
+++ b/WebCore/svg/SVGFEOffsetElement.cpp
@@ -57,7 +57,7 @@ void SVGFEOffsetElement::svgAttributeChanged(const QualifiedName& attrName)
if (attrName == SVGNames::inAttr
|| attrName == SVGNames::dxAttr
|| attrName == SVGNames::dyAttr)
- invalidate();
+ SVGFilterElement::invalidateFilter(this);
}
void SVGFEOffsetElement::synchronizeProperty(const QualifiedName& attrName)
diff --git a/WebCore/svg/SVGFilterElement.h b/WebCore/svg/SVGFilterElement.h
index c228fe7..67d0a47 100644
--- a/WebCore/svg/SVGFilterElement.h
+++ b/WebCore/svg/SVGFilterElement.h
@@ -45,6 +45,22 @@ public:
void setFilterRes(unsigned long filterResX, unsigned long filterResY);
FloatRect filterBoundingBox(const FloatRect&) const;
+ static void invalidateFilter(SVGElement* element)
+ {
+ ASSERT(element);
+ if (!element->inDocument())
+ return;
+ Node* parent = element->parentNode();
+ while (parent && !parent->hasTagName(SVGNames::filterTag))
+ parent = parent->parentNode();
+
+ if (!parent)
+ return;
+
+ if (RenderObject* object = parent->renderer())
+ object->setNeedsLayout(true);
+ }
+
private:
SVGFilterElement(const QualifiedName&, Document*);
diff --git a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
index c2c443e..07d9241 100644
--- a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
+++ b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
@@ -26,7 +26,6 @@
#include "Attribute.h"
#include "FilterEffect.h"
-#include "RenderSVGResourceFilterPrimitive.h"
#include "SVGLength.h"
#include "SVGNames.h"
#include "SVGStyledElement.h"
@@ -71,7 +70,7 @@ void SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(const QualifiedNa
|| attrName == SVGNames::widthAttr
|| attrName == SVGNames::heightAttr
|| attrName == SVGNames::resultAttr)
- invalidate();
+ SVGFilterElement::invalidateFilter(this);
}
void SVGFilterPrimitiveStandardAttributes::synchronizeProperty(const QualifiedName& attrName)
@@ -104,7 +103,7 @@ void SVGFilterPrimitiveStandardAttributes::childrenChanged(bool changedByParser,
SVGStyledElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
if (!changedByParser)
- invalidate();
+ SVGFilterElement::invalidateFilter(this);
}
void SVGFilterPrimitiveStandardAttributes::setStandardAttributes(bool primitiveBoundingBoxMode, FilterEffect* filterEffect) const
@@ -137,11 +136,6 @@ void SVGFilterPrimitiveStandardAttributes::setStandardAttributes(bool primitiveB
filterEffect->setEffectBoundaries(effectBBox);
}
-RenderObject* SVGFilterPrimitiveStandardAttributes::createRenderer(RenderArena* arena, RenderStyle*)
-{
- return new (arena) RenderSVGResourceFilterPrimitive(this);
-}
-
}
#endif // ENABLE(SVG)
diff --git a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
index 0ffa1c9..2fb41ea 100644
--- a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
+++ b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
@@ -23,7 +23,6 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
-#include "RenderSVGResource.h"
#include "SVGFilterBuilder.h"
#include "SVGFilterElement.h"
#include "SVGNames.h"
@@ -48,17 +47,10 @@ protected:
virtual void synchronizeProperty(const QualifiedName&);
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
-protected:
- inline void invalidate()
- {
- if (RenderObject* primitiveRenderer = renderer())
- RenderSVGResource::markForLayoutAndParentResourceInvalidation(primitiveRenderer);
- }
-
private:
virtual bool isFilterEffect() const { return true; }
- virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+ virtual bool rendererIsNeeded(RenderStyle*) { return false; }
DECLARE_ANIMATED_PROPERTY(SVGFilterPrimitiveStandardAttributes, SVGNames::xAttr, SVGLength, X, x)
DECLARE_ANIMATED_PROPERTY(SVGFilterPrimitiveStandardAttributes, SVGNames::yAttr, SVGLength, Y, y)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list