2009-05-28 Dirk Schulze <krit@webkit.org>
Reviewed by Nikolas Zimmermann.
Added a new build flag --filters. This replaces the old --svg-filters and enables
other parts of WebKit to use some basic filters of platform/graphics/filters if needed.
This patch also fixes a bug in dom/DOMImplementation.cpp where we used SVG_FILTER. This flag
doesn't exist and was replaced by FILTERS as well as all SVG_FILTERS occurrences.
Filters are not working yet. This patch is just a preperation. Filters are deactivated by
default.
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.make:
* GNUmakefile.am:
* WebCore.pro:
* bindings/objc/DOM.mm:
(WebCore::createElementClassMap):
* dom/DOMImplementation.cpp:
(WebCore::isSVG10Feature):
(WebCore::isSVG11Feature):
* page/DOMWindow.idl:
* platform/graphics/filters/FEBlend.cpp:
* platform/graphics/filters/FEBlend.h:
* platform/graphics/filters/FEColorMatrix.cpp:
* platform/graphics/filters/FEColorMatrix.h:
* platform/graphics/filters/FEComponentTransfer.cpp:
* platform/graphics/filters/FEComponentTransfer.h:
* platform/graphics/filters/FEComposite.cpp:
* platform/graphics/filters/FEComposite.h:
* platform/graphics/filters/FilterEffect.cpp:
* platform/graphics/filters/FilterEffect.h:
* platform/graphics/filters/SourceAlpha.cpp:
* platform/graphics/filters/SourceAlpha.h:
* platform/graphics/filters/SourceGraphic.cpp:
* platform/graphics/filters/SourceGraphic.h:
* rendering/RenderSVGContainer.cpp:
(WebCore::RenderSVGContainer::selfWillPaint):
* rendering/RenderSVGModelObject.cpp:
* rendering/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::selfWillPaint):
* rendering/SVGRenderSupport.cpp:
(WebCore::SVGRenderBase::prepareToRenderSVGContent):
(WebCore::SVGRenderBase::finishRenderSVGContent):
(WebCore::SVGRenderBase::filterBoundingBoxForRenderer):
* svg/Filter.cpp:
* svg/Filter.h:
* svg/FilterBuilder.cpp:
* svg/FilterBuilder.h:
* svg/SVGComponentTransferFunctionElement.cpp:
* svg/SVGComponentTransferFunctionElement.h:
* svg/SVGComponentTransferFunctionElement.idl:
* svg/SVGFEBlendElement.cpp:
* svg/SVGFEBlendElement.h:
* svg/SVGFEBlendElement.idl:
* svg/SVGFEColorMatrixElement.cpp:
* svg/SVGFEColorMatrixElement.h:
* svg/SVGFEColorMatrixElement.idl:
* svg/SVGFEComponentTransferElement.cpp:
* svg/SVGFEComponentTransferElement.h:
* svg/SVGFEComponentTransferElement.idl:
* svg/SVGFECompositeElement.cpp:
* svg/SVGFECompositeElement.h:
* svg/SVGFECompositeElement.idl:
* svg/SVGFEDiffuseLightingElement.cpp:
* svg/SVGFEDiffuseLightingElement.h:
* svg/SVGFEDiffuseLightingElement.idl:
* svg/SVGFEDisplacementMapElement.cpp:
* svg/SVGFEDisplacementMapElement.h:
* svg/SVGFEDisplacementMapElement.idl:
* svg/SVGFEDistantLightElement.cpp:
* svg/SVGFEDistantLightElement.h:
* svg/SVGFEDistantLightElement.idl:
* svg/SVGFEFloodElement.cpp:
* svg/SVGFEFloodElement.h:
* svg/SVGFEFloodElement.idl:
* svg/SVGFEFuncAElement.cpp:
* svg/SVGFEFuncAElement.h:
* svg/SVGFEFuncAElement.idl:
* svg/SVGFEFuncBElement.cpp:
* svg/SVGFEFuncBElement.h:
* svg/SVGFEFuncBElement.idl:
* svg/SVGFEFuncGElement.cpp:
* svg/SVGFEFuncGElement.h:
* svg/SVGFEFuncGElement.idl:
* svg/SVGFEFuncRElement.cpp:
* svg/SVGFEFuncRElement.h:
* svg/SVGFEFuncRElement.idl:
* svg/SVGFEGaussianBlurElement.cpp:
* svg/SVGFEGaussianBlurElement.h:
* svg/SVGFEGaussianBlurElement.idl:
* svg/SVGFEImageElement.cpp:
* svg/SVGFEImageElement.h:
* svg/SVGFEImageElement.idl:
* svg/SVGFELightElement.cpp:
* svg/SVGFELightElement.h:
* svg/SVGFEMergeElement.cpp:
* svg/SVGFEMergeElement.h:
* svg/SVGFEMergeElement.idl:
* svg/SVGFEMergeNodeElement.cpp:
* svg/SVGFEMergeNodeElement.h:
* svg/SVGFEMergeNodeElement.idl:
* svg/SVGFEOffsetElement.cpp:
* svg/SVGFEOffsetElement.h:
* svg/SVGFEOffsetElement.idl:
* svg/SVGFEPointLightElement.cpp:
* svg/SVGFEPointLightElement.h:
* svg/SVGFEPointLightElement.idl:
* svg/SVGFESpecularLightingElement.cpp:
* svg/SVGFESpecularLightingElement.h:
* svg/SVGFESpecularLightingElement.idl:
* svg/SVGFESpotLightElement.cpp:
* svg/SVGFESpotLightElement.h:
* svg/SVGFESpotLightElement.idl:
* svg/SVGFETileElement.cpp:
* svg/SVGFETileElement.h:
* svg/SVGFETileElement.idl:
* svg/SVGFETurbulenceElement.cpp:
* svg/SVGFETurbulenceElement.h:
* svg/SVGFETurbulenceElement.idl:
* svg/SVGFilterElement.cpp:
* svg/SVGFilterElement.h:
* svg/SVGFilterElement.idl:
* svg/SVGFilterPrimitiveStandardAttributes.cpp:
* svg/SVGFilterPrimitiveStandardAttributes.h:
* svg/graphics/SVGResourceFilter.cpp:
* svg/graphics/SVGResourceFilter.h:
* svg/graphics/cairo/SVGResourceFilterCairo.cpp:
* svg/graphics/cg/SVGResourceFilterCg.cpp:
* svg/graphics/cg/SVGResourceFilterCg.mm:
* svg/graphics/filters/SVGDistantLightSource.h:
* svg/graphics/filters/SVGFEConvolveMatrix.cpp:
* svg/graphics/filters/SVGFEConvolveMatrix.h:
* svg/graphics/filters/SVGFEDiffuseLighting.cpp:
* svg/graphics/filters/SVGFEDiffuseLighting.h:
* svg/graphics/filters/SVGFEDisplacementMap.cpp:
* svg/graphics/filters/SVGFEDisplacementMap.h:
* svg/graphics/filters/SVGFEFlood.cpp:
* svg/graphics/filters/SVGFEFlood.h:
* svg/graphics/filters/SVGFEGaussianBlur.cpp:
* svg/graphics/filters/SVGFEGaussianBlur.h:
* svg/graphics/filters/SVGFEImage.cpp:
* svg/graphics/filters/SVGFEImage.h:
* svg/graphics/filters/SVGFEMerge.cpp:
* svg/graphics/filters/SVGFEMerge.h:
* svg/graphics/filters/SVGFEMorphology.cpp:
* svg/graphics/filters/SVGFEMorphology.h:
* svg/graphics/filters/SVGFEOffset.cpp:
* svg/graphics/filters/SVGFEOffset.h:
* svg/graphics/filters/SVGFESpecularLighting.cpp:
* svg/graphics/filters/SVGFESpecularLighting.h:
* svg/graphics/filters/SVGFETile.cpp:
* svg/graphics/filters/SVGFETile.h:
* svg/graphics/filters/SVGFETurbulence.cpp:
* svg/graphics/filters/SVGFETurbulence.h:
* svg/graphics/filters/SVGFilterEffect.cpp:
* svg/graphics/filters/SVGFilterEffect.h:
* svg/graphics/filters/SVGLightSource.cpp:
* svg/graphics/filters/SVGLightSource.h:
* svg/graphics/filters/SVGPointLightSource.h:
* svg/graphics/filters/SVGSpotLightSource.h:
* svg/graphics/filters/cg/SVGFEHelpersCg.h:
* svg/graphics/filters/cg/SVGFEHelpersCg.mm:
* svg/graphics/filters/cg/SVGFilterEffectCg.mm:
* svg/graphics/filters/cg/WKArithmeticFilter.h:
* svg/graphics/filters/cg/WKArithmeticFilter.m:
* svg/graphics/filters/cg/WKComponentMergeFilter.h:
* svg/graphics/filters/cg/WKComponentMergeFilter.m:
* svg/graphics/filters/cg/WKDiffuseLightingFilter.h:
* svg/graphics/filters/cg/WKDiffuseLightingFilter.m:
* svg/graphics/filters/cg/WKDiscreteTransferFilter.h:
* svg/graphics/filters/cg/WKDiscreteTransferFilter.m:
* svg/graphics/filters/cg/WKDisplacementMapFilter.h
* svg/graphics/filters/cg/WKDisplacementMapFilter.m:
* svg/graphics/filters/cg/WKDistantLightFilter.h:
* svg/graphics/filters/cg/WKDistantLightFilter.m:
* svg/graphics/filters/cg/WKGammaTransferFilter.h:
* svg/graphics/filters/cg/WKGammaTransferFilter.m:
* svg/graphics/filters/cg/WKIdentityTransferFilter.h:
* svg/graphics/filters/cg/WKIdentityTransferFilter.m:
* svg/graphics/filters/cg/WKLinearTransferFilter.h:
* svg/graphics/filters/cg/WKLinearTransferFilter.m:
* svg/graphics/filters/cg/WKNormalMapFilter.h:
* svg/graphics/filters/cg/WKNormalMapFilter.m:
* svg/graphics/filters/cg/WKPointLightFilter.h:
* svg/graphics/filters/cg/WKPointLightFilter.m:
* svg/graphics/filters/cg/WKSpecularLightingFilter.h:
* svg/graphics/filters/cg/WKSpecularLightingFilter.m:
* svg/graphics/filters/cg/WKSpotLightFilter.h:
* svg/graphics/filters/cg/WKSpotLightFilter.m:
* svg/graphics/filters/cg/WKTableTransferFilter.h:
* svg/graphics/filters/cg/WKTableTransferFilter.m:
* svg/graphics/mac/SVGResourceFilterPlatformDataMac.h:
* svg/graphics/mac/SVGResourceFilterPlatformDataMac.mm:
* svg/graphics/qt/SVGResourceFilterQt.cpp:
* svg/graphics/skia/SVGResourceFilterSkia.cpp:
* svg/svgtags.in:
*WebKit/mac/
2009-05-28 Dirk Schulze <krit@webkit.org>
Reviewed by Nikolas Zimmermann.
Added new build flag --filters. More details in WebCore/ChangeLog.
* Configurations/FeatureDefines.xcconfig:
*.
2009-05-28 Dirk Schulze <krit@webkit.org>
Reviewed by Nikolas Zimmermann.
Enable the new build flag --filters for Gtk. More details in WebCore/ChangeLog.
* configure.ac:
*JavaScriptCore/
2009-05-28 Dirk Schulze <krit@webkit.org>
Reviewed by Nikolas Zimmermann.
Added new build flag --filters for Mac. More details in WebCore/ChangeLog.
* Configurations/FeatureDefines.xcconfig:
*WebKitTools
2009-05-28 Dirk Schulze <krit@webkit.org>
Reviewed by Nikolas Zimmermann.
Added new build flag --filters. More details in WebCore/ChangeLog.
* Scripts/build-webkit:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index f5a1324..718daa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-28 Dirk Schulze <krit@webkit.org>
+
+ Reviewed by Nikolas Zimmermann.
+
+ Enable the new build flag --filters for Gtk. More details in WebCore/ChangeLog.
+
+ * configure.ac:
+
2009-05-19 Xan Lopez <xlopez@igalia.com>
Reviewed by Jan Alonzo and Gustavo Noronha.
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8e59afb..bb1c065 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-28 Dirk Schulze <krit@webkit.org>
+
+ Reviewed by Nikolas Zimmermann.
+
+ Added new build flag --filters for Mac. More details in WebCore/ChangeLog.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2009-05-27 Oliver Hunt <oliver@apple.com>
Reviewed by Mark Rowe.
diff --git a/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/JavaScriptCore/Configurations/FeatureDefines.xcconfig
index c9a5265..95fb0c6 100644
--- a/JavaScriptCore/Configurations/FeatureDefines.xcconfig
+++ b/JavaScriptCore/Configurations/FeatureDefines.xcconfig
@@ -31,6 +31,7 @@
ENABLE_CHANNEL_MESSAGING = ;
ENABLE_DATABASE = ENABLE_DATABASE;
ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
+ENABLE_FILTERS = ;
ENABLE_GEOLOCATION = ;
ENABLE_ICONDATABASE = ENABLE_ICONDATABASE;
ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
@@ -48,4 +49,4 @@
ENABLE_XPATH = ENABLE_XPATH;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_DATABASE) $(ENABLE_DOM_STORAGE) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_DATABASE) $(ENABLE_DOM_STORAGE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ea585bd..e0dc2a9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,200 @@
+2009-05-28 Dirk Schulze <krit@webkit.org>
+
+ Reviewed by Nikolas Zimmermann.
+
+ Added a new build flag --filters. This replaces the old --svg-filters and enables
+ other parts of WebKit to use some basic filters of platform/graphics/filters if needed.
+ This patch also fixes a bug in dom/DOMImplementation.cpp where we used SVG_FILTER. This flag
+ doesn't exist and was replaced by FILTERS as well as all SVG_FILTERS occurrences.
+ Filters are not working yet. This patch is just a preperation. Filters are deactivated by
+ default.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * WebCore.pro:
+ * bindings/objc/DOM.mm:
+ (WebCore::createElementClassMap):
+ * dom/DOMImplementation.cpp:
+ (WebCore::isSVG10Feature):
+ (WebCore::isSVG11Feature):
+ * page/DOMWindow.idl:
+ * platform/graphics/filters/FEBlend.cpp:
+ * platform/graphics/filters/FEBlend.h:
+ * platform/graphics/filters/FEColorMatrix.cpp:
+ * platform/graphics/filters/FEColorMatrix.h:
+ * platform/graphics/filters/FEComponentTransfer.cpp:
+ * platform/graphics/filters/FEComponentTransfer.h:
+ * platform/graphics/filters/FEComposite.cpp:
+ * platform/graphics/filters/FEComposite.h:
+ * platform/graphics/filters/FilterEffect.cpp:
+ * platform/graphics/filters/FilterEffect.h:
+ * platform/graphics/filters/SourceAlpha.cpp:
+ * platform/graphics/filters/SourceAlpha.h:
+ * platform/graphics/filters/SourceGraphic.cpp:
+ * platform/graphics/filters/SourceGraphic.h:
+ * rendering/RenderSVGContainer.cpp:
+ (WebCore::RenderSVGContainer::selfWillPaint):
+ * rendering/RenderSVGModelObject.cpp:
+ * rendering/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::selfWillPaint):
+ * rendering/SVGRenderSupport.cpp:
+ (WebCore::SVGRenderBase::prepareToRenderSVGContent):
+ (WebCore::SVGRenderBase::finishRenderSVGContent):
+ (WebCore::SVGRenderBase::filterBoundingBoxForRenderer):
+ * svg/Filter.cpp:
+ * svg/Filter.h:
+ * svg/FilterBuilder.cpp:
+ * svg/FilterBuilder.h:
+ * svg/SVGComponentTransferFunctionElement.cpp:
+ * svg/SVGComponentTransferFunctionElement.h:
+ * svg/SVGComponentTransferFunctionElement.idl:
+ * svg/SVGFEBlendElement.cpp:
+ * svg/SVGFEBlendElement.h:
+ * svg/SVGFEBlendElement.idl:
+ * svg/SVGFEColorMatrixElement.cpp:
+ * svg/SVGFEColorMatrixElement.h:
+ * svg/SVGFEColorMatrixElement.idl:
+ * svg/SVGFEComponentTransferElement.cpp:
+ * svg/SVGFEComponentTransferElement.h:
+ * svg/SVGFEComponentTransferElement.idl:
+ * svg/SVGFECompositeElement.cpp:
+ * svg/SVGFECompositeElement.h:
+ * svg/SVGFECompositeElement.idl:
+ * svg/SVGFEDiffuseLightingElement.cpp:
+ * svg/SVGFEDiffuseLightingElement.h:
+ * svg/SVGFEDiffuseLightingElement.idl:
+ * svg/SVGFEDisplacementMapElement.cpp:
+ * svg/SVGFEDisplacementMapElement.h:
+ * svg/SVGFEDisplacementMapElement.idl:
+ * svg/SVGFEDistantLightElement.cpp:
+ * svg/SVGFEDistantLightElement.h:
+ * svg/SVGFEDistantLightElement.idl:
+ * svg/SVGFEFloodElement.cpp:
+ * svg/SVGFEFloodElement.h:
+ * svg/SVGFEFloodElement.idl:
+ * svg/SVGFEFuncAElement.cpp:
+ * svg/SVGFEFuncAElement.h:
+ * svg/SVGFEFuncAElement.idl:
+ * svg/SVGFEFuncBElement.cpp:
+ * svg/SVGFEFuncBElement.h:
+ * svg/SVGFEFuncBElement.idl:
+ * svg/SVGFEFuncGElement.cpp:
+ * svg/SVGFEFuncGElement.h:
+ * svg/SVGFEFuncGElement.idl:
+ * svg/SVGFEFuncRElement.cpp:
+ * svg/SVGFEFuncRElement.h:
+ * svg/SVGFEFuncRElement.idl:
+ * svg/SVGFEGaussianBlurElement.cpp:
+ * svg/SVGFEGaussianBlurElement.h:
+ * svg/SVGFEGaussianBlurElement.idl:
+ * svg/SVGFEImageElement.cpp:
+ * svg/SVGFEImageElement.h:
+ * svg/SVGFEImageElement.idl:
+ * svg/SVGFELightElement.cpp:
+ * svg/SVGFELightElement.h:
+ * svg/SVGFEMergeElement.cpp:
+ * svg/SVGFEMergeElement.h:
+ * svg/SVGFEMergeElement.idl:
+ * svg/SVGFEMergeNodeElement.cpp:
+ * svg/SVGFEMergeNodeElement.h:
+ * svg/SVGFEMergeNodeElement.idl:
+ * svg/SVGFEOffsetElement.cpp:
+ * svg/SVGFEOffsetElement.h:
+ * svg/SVGFEOffsetElement.idl:
+ * svg/SVGFEPointLightElement.cpp:
+ * svg/SVGFEPointLightElement.h:
+ * svg/SVGFEPointLightElement.idl:
+ * svg/SVGFESpecularLightingElement.cpp:
+ * svg/SVGFESpecularLightingElement.h:
+ * svg/SVGFESpecularLightingElement.idl:
+ * svg/SVGFESpotLightElement.cpp:
+ * svg/SVGFESpotLightElement.h:
+ * svg/SVGFESpotLightElement.idl:
+ * svg/SVGFETileElement.cpp:
+ * svg/SVGFETileElement.h:
+ * svg/SVGFETileElement.idl:
+ * svg/SVGFETurbulenceElement.cpp:
+ * svg/SVGFETurbulenceElement.h:
+ * svg/SVGFETurbulenceElement.idl:
+ * svg/SVGFilterElement.cpp:
+ * svg/SVGFilterElement.h:
+ * svg/SVGFilterElement.idl:
+ * svg/SVGFilterPrimitiveStandardAttributes.cpp:
+ * svg/SVGFilterPrimitiveStandardAttributes.h:
+ * svg/graphics/SVGResourceFilter.cpp:
+ * svg/graphics/SVGResourceFilter.h:
+ * svg/graphics/cairo/SVGResourceFilterCairo.cpp:
+ * svg/graphics/cg/SVGResourceFilterCg.cpp:
+ * svg/graphics/cg/SVGResourceFilterCg.mm:
+ * svg/graphics/filters/SVGDistantLightSource.h:
+ * svg/graphics/filters/SVGFEConvolveMatrix.cpp:
+ * svg/graphics/filters/SVGFEConvolveMatrix.h:
+ * svg/graphics/filters/SVGFEDiffuseLighting.cpp:
+ * svg/graphics/filters/SVGFEDiffuseLighting.h:
+ * svg/graphics/filters/SVGFEDisplacementMap.cpp:
+ * svg/graphics/filters/SVGFEDisplacementMap.h:
+ * svg/graphics/filters/SVGFEFlood.cpp:
+ * svg/graphics/filters/SVGFEFlood.h:
+ * svg/graphics/filters/SVGFEGaussianBlur.cpp:
+ * svg/graphics/filters/SVGFEGaussianBlur.h:
+ * svg/graphics/filters/SVGFEImage.cpp:
+ * svg/graphics/filters/SVGFEImage.h:
+ * svg/graphics/filters/SVGFEMerge.cpp:
+ * svg/graphics/filters/SVGFEMerge.h:
+ * svg/graphics/filters/SVGFEMorphology.cpp:
+ * svg/graphics/filters/SVGFEMorphology.h:
+ * svg/graphics/filters/SVGFEOffset.cpp:
+ * svg/graphics/filters/SVGFEOffset.h:
+ * svg/graphics/filters/SVGFESpecularLighting.cpp:
+ * svg/graphics/filters/SVGFESpecularLighting.h:
+ * svg/graphics/filters/SVGFETile.cpp:
+ * svg/graphics/filters/SVGFETile.h:
+ * svg/graphics/filters/SVGFETurbulence.cpp:
+ * svg/graphics/filters/SVGFETurbulence.h:
+ * svg/graphics/filters/SVGFilterEffect.cpp:
+ * svg/graphics/filters/SVGFilterEffect.h:
+ * svg/graphics/filters/SVGLightSource.cpp:
+ * svg/graphics/filters/SVGLightSource.h:
+ * svg/graphics/filters/SVGPointLightSource.h:
+ * svg/graphics/filters/SVGSpotLightSource.h:
+ * svg/graphics/filters/cg/SVGFEHelpersCg.h:
+ * svg/graphics/filters/cg/SVGFEHelpersCg.mm:
+ * svg/graphics/filters/cg/SVGFilterEffectCg.mm:
+ * svg/graphics/filters/cg/WKArithmeticFilter.h:
+ * svg/graphics/filters/cg/WKArithmeticFilter.m:
+ * svg/graphics/filters/cg/WKComponentMergeFilter.h:
+ * svg/graphics/filters/cg/WKComponentMergeFilter.m:
+ * svg/graphics/filters/cg/WKDiffuseLightingFilter.h:
+ * svg/graphics/filters/cg/WKDiffuseLightingFilter.m:
+ * svg/graphics/filters/cg/WKDiscreteTransferFilter.h:
+ * svg/graphics/filters/cg/WKDiscreteTransferFilter.m:
+ * svg/graphics/filters/cg/WKDisplacementMapFilter.h:
+ * svg/graphics/filters/cg/WKDisplacementMapFilter.m:
+ * svg/graphics/filters/cg/WKDistantLightFilter.h:
+ * svg/graphics/filters/cg/WKDistantLightFilter.m:
+ * svg/graphics/filters/cg/WKGammaTransferFilter.h:
+ * svg/graphics/filters/cg/WKGammaTransferFilter.m:
+ * svg/graphics/filters/cg/WKIdentityTransferFilter.h:
+ * svg/graphics/filters/cg/WKIdentityTransferFilter.m:
+ * svg/graphics/filters/cg/WKLinearTransferFilter.h:
+ * svg/graphics/filters/cg/WKLinearTransferFilter.m:
+ * svg/graphics/filters/cg/WKNormalMapFilter.h:
+ * svg/graphics/filters/cg/WKNormalMapFilter.m:
+ * svg/graphics/filters/cg/WKPointLightFilter.h:
+ * svg/graphics/filters/cg/WKPointLightFilter.m:
+ * svg/graphics/filters/cg/WKSpecularLightingFilter.h:
+ * svg/graphics/filters/cg/WKSpecularLightingFilter.m:
+ * svg/graphics/filters/cg/WKSpotLightFilter.h:
+ * svg/graphics/filters/cg/WKSpotLightFilter.m:
+ * svg/graphics/filters/cg/WKTableTransferFilter.h:
+ * svg/graphics/filters/cg/WKTableTransferFilter.m:
+ * svg/graphics/mac/SVGResourceFilterPlatformDataMac.h:
+ * svg/graphics/mac/SVGResourceFilterPlatformDataMac.mm:
+ * svg/graphics/qt/SVGResourceFilterQt.cpp:
+ * svg/graphics/skia/SVGResourceFilterSkia.cpp:
+ * svg/svgtags.in:
+
2009-05-28 Brett Wilson <brettw@chromium.org>
Unreviewed, build fix.
diff --git a/WebCore/Configurations/FeatureDefines.xcconfig b/WebCore/Configurations/FeatureDefines.xcconfig
index c9a5265..95fb0c6 100644
--- a/WebCore/Configurations/FeatureDefines.xcconfig
+++ b/WebCore/Configurations/FeatureDefines.xcconfig
@@ -31,6 +31,7 @@
ENABLE_CHANNEL_MESSAGING = ;
ENABLE_DATABASE = ENABLE_DATABASE;
ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
+ENABLE_FILTERS = ;
ENABLE_GEOLOCATION = ;
ENABLE_ICONDATABASE = ENABLE_ICONDATABASE;
ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
@@ -48,4 +49,4 @@
ENABLE_XPATH = ENABLE_XPATH;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_DATABASE) $(ENABLE_DOM_STORAGE) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_DATABASE) $(ENABLE_DOM_STORAGE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
diff --git a/WebCore/DerivedSources.make b/WebCore/DerivedSources.make
index 075cec4..f1c3058 100644
--- a/WebCore/DerivedSources.make
+++ b/WebCore/DerivedSources.make
@@ -587,8 +587,8 @@
SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FONTS=1
endif
-ifeq ($(findstring ENABLE_SVG_FILTERS,$(FEATURE_DEFINES)), ENABLE_SVG_FILTERS)
- SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FILTERS=1
+ifeq ($(findstring ENABLE_FILTERS,$(FEATURE_DEFINES)), ENABLE_FILTERS)
+ SVG_FLAGS := $(SVG_FLAGS) ENABLE_FILTERS=1
ifeq ($(findstring ENABLE_SVG_DOM_OBJC_BINDINGS,$(FEATURE_DEFINES)), ENABLE_SVG_DOM_OBJC_BINDINGS)
WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.SVG.Filters.exp
endif
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 79d124d..3374eb9 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1441,13 +1441,6 @@
WebCore/platform/graphics/UnitBezier.h \
WebCore/platform/graphics/WidthIterator.cpp \
WebCore/platform/graphics/WidthIterator.h \
- WebCore/platform/graphics/filters/FEBlend.h \
- WebCore/platform/graphics/filters/FEColorMatrix.h \
- WebCore/platform/graphics/filters/FEComponentTransfer.h \
- WebCore/platform/graphics/filters/FEComposite.h \
- WebCore/platform/graphics/filters/FilterEffect.h \
- WebCore/platform/graphics/filters/SourceAlpha.h \
- WebCore/platform/graphics/filters/SourceGraphic.h \
WebCore/platform/graphics/transforms/IdentityTransformOperation.h \
WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp \
WebCore/platform/graphics/transforms/MatrixTransformOperation.h \
@@ -2348,6 +2341,36 @@
endif # END ENABLE_WML
# ----
+# Filters
+# ----
+if ENABLE_FILTERS
+
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1
+webcore_cppflags += -DENABLE_FILTERS=1
+
+webcore_sources += \
+ WebCore/platform/graphics/filters/FEBlend.cpp \
+ WebCore/platform/graphics/filters/FEBlend.h \
+ WebCore/platform/graphics/filters/FEColorMatrix.cpp \
+ WebCore/platform/graphics/filters/FEColorMatrix.h \
+ WebCore/platform/graphics/filters/FEComponentTransfer.cpp \
+ WebCore/platform/graphics/filters/FEComponentTransfer.h \
+ WebCore/platform/graphics/filters/FEComposite.cpp \
+ WebCore/platform/graphics/filters/FEComposite.h \
+ WebCore/platform/graphics/filters/FilterEffect.cpp \
+ WebCore/platform/graphics/filters/FilterEffect.h \
+ WebCore/platform/graphics/filters/SourceAlpha.cpp \
+ WebCore/platform/graphics/filters/SourceAlpha.h \
+ WebCore/platform/graphics/filters/SourceGraphic.cpp \
+ WebCore/platform/graphics/filters/SourceGraphic.h
+
+if ENABLE_SVG
+SVG_FEATURES += ENABLE_FILTERS=1
+endif
+
+endif # END ENABLE_FILTERS
+
+# ----
# Geolocation
# ----
if ENABLE_GEOLOCATION
@@ -2550,13 +2573,6 @@
WebCore/css/SVGCSSComputedStyleDeclaration.cpp \
WebCore/css/SVGCSSParser.cpp \
WebCore/css/SVGCSSStyleSelector.cpp \
- WebCore/platform/graphics/filters/FEBlend.cpp \
- WebCore/platform/graphics/filters/FEColorMatrix.cpp \
- WebCore/platform/graphics/filters/FEComponentTransfer.cpp \
- WebCore/platform/graphics/filters/FEComposite.cpp \
- WebCore/platform/graphics/filters/FilterEffect.cpp \
- WebCore/platform/graphics/filters/SourceAlpha.cpp \
- WebCore/platform/graphics/filters/SourceGraphic.cpp \
WebCore/rendering/PointerEventsHitRules.cpp \
WebCore/rendering/PointerEventsHitRules.h \
WebCore/rendering/RenderForeignObject.cpp \
@@ -2971,12 +2987,6 @@
webcore_cppflags += -DENABLE_SVG_FONTS=1
endif
-if ENABLE_SVG_FILTERS
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_FILTERS=1
-SVG_FEATURES += ENABLE_SVG_FILTERS=1
-webcore_cppflags += -DENABLE_SVG_FILTERS=1
-endif
-
if ENABLE_SVG_AS_IMAGE
FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_AS_IMAGE=1
SVG_FEATURES += ENABLE_SVG_AS_IMAGE=1
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index e5060b8e..1242097 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -104,6 +104,7 @@
}
!contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=.): DEFINES += ENABLE_DASHBOARD_SUPPORT=0
+!contains(DEFINES, ENABLE_FILTERS=.): DEFINES += ENABLE_FILTERS=0
!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
!contains(DEFINES, ENABLE_XSLT=.): DEFINES += ENABLE_XSLT=0
#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
@@ -119,10 +120,8 @@
!contains(DEFINES, ENABLE_SVG_ANIMATION=.): DEFINES += ENABLE_SVG_ANIMATION=1
!contains(DEFINES, ENABLE_SVG_AS_IMAGE=.): DEFINES += ENABLE_SVG_AS_IMAGE=1
!contains(DEFINES, ENABLE_SVG_USE=.): DEFINES += ENABLE_SVG_USE=1
- # disabled due svg filter rework
- !contains(DEFINES, ENABLE_SVG_FILTERS=.): DEFINES += ENABLE_SVG_FILTERS=0
} else {
- DEFINES += ENABLE_SVG_FONTS=0 ENABLE_SVG_FILTERS=0 ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_ANIMATION=0 ENABLE_SVG_AS_IMAGE=0 ENABLE_SVG_USE=0
+ DEFINES += ENABLE_SVG_FONTS=0 ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_ANIMATION=0 ENABLE_SVG_AS_IMAGE=0 ENABLE_SVG_USE=0
}
# HTML5 media support
@@ -1487,6 +1486,19 @@
FEATURE_DEFINES_JAVASCRIPT += ENABLE_XBL=1
}
+contains(DEFINES, ENABLE_FILTERS=1) {
+ SOURCES += \
+ platform/graphics/filters/FEBlend.cpp \
+ platform/graphics/filters/FEColorMatrix.cpp \
+ platform/graphics/filters/FEComponentTransfer.cpp \
+ platform/graphics/filters/FEComposite.cpp \
+ platform/graphics/filters/FilterEffect.cpp \
+ platform/graphics/filters/SourceAlpha.cpp \
+ platform/graphics/filters/SourceGraphic.cpp
+
+ FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1
+}
+
contains(DEFINES, ENABLE_WML=1) {
SOURCES += \
wml/WMLAElement.cpp \
@@ -1841,13 +1853,6 @@
svg/animation/SMILTime.cpp \
svg/animation/SMILTimeContainer.cpp \
svg/animation/SVGSMILElement.cpp \
- platform/graphics/filters/FEBlend.cpp \
- platform/graphics/filters/FEColorMatrix.cpp \
- platform/graphics/filters/FEComponentTransfer.cpp \
- platform/graphics/filters/FEComposite.cpp \
- platform/graphics/filters/FilterEffect.cpp \
- platform/graphics/filters/SourceAlpha.cpp \
- platform/graphics/filters/SourceGraphic.cpp \
svg/graphics/filters/SVGFEConvolveMatrix.cpp \
svg/graphics/filters/SVGFEDiffuseLighting.cpp \
svg/graphics/filters/SVGFEDisplacementMap.cpp \
diff --git a/WebCore/bindings/objc/DOM.mm b/WebCore/bindings/objc/DOM.mm
index b54f385..3fd28d1 100644
--- a/WebCore/bindings/objc/DOM.mm
+++ b/WebCore/bindings/objc/DOM.mm
@@ -160,7 +160,7 @@
addElementClass(SVGNames::defsTag, [DOMSVGDefsElement class]);
addElementClass(SVGNames::descTag, [DOMSVGDescElement class]);
addElementClass(SVGNames::ellipseTag, [DOMSVGEllipseElement class]);
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
addElementClass(SVGNames::feBlendTag, [DOMSVGFEBlendElement class]);
addElementClass(SVGNames::feColorMatrixTag, [DOMSVGFEColorMatrixElement class]);
addElementClass(SVGNames::feComponentTransferTag, [DOMSVGFEComponentTransferElement class]);
diff --git a/WebCore/dom/DOMImplementation.cpp b/WebCore/dom/DOMImplementation.cpp
index 16a49ba..783c629 100644
--- a/WebCore/dom/DOMImplementation.cpp
+++ b/WebCore/dom/DOMImplementation.cpp
@@ -76,7 +76,7 @@
static bool initialized = false;
DEFINE_STATIC_LOCAL(FeatureSet, svgFeatures, ());
if (!initialized) {
-#if ENABLE(SVG_USE) && ENABLE(SVG_FOREIGN_OBJECT) && ENABLE(SVG_FILTER) && ENABLE(SVG_FONTS)
+#if ENABLE(SVG_USE) && ENABLE(SVG_FOREIGN_OBJECT) && ENABLE(FILTERS) && ENABLE(SVG_FONTS)
addString(svgFeatures, "svg");
addString(svgFeatures, "svg.static");
#endif
@@ -84,7 +84,7 @@
// addString(svgFeatures, "svg.dynamic");
// addString(svgFeatures, "svg.dom.animation");
// addString(svgFeatures, "svg.dom.dynamic");
-#if ENABLE(SVG_USE) && ENABLE(SVG_FOREIGN_OBJECT) && ENABLE(SVG_FILTER) && ENABLE(SVG_FONTS)
+#if ENABLE(SVG_USE) && ENABLE(SVG_FOREIGN_OBJECT) && ENABLE(FILTERS) && ENABLE(SVG_FONTS)
addString(svgFeatures, "dom");
addString(svgFeatures, "dom.svg");
addString(svgFeatures, "dom.svg.static");
@@ -104,7 +104,7 @@
// Sadly, we cannot claim to implement any of the SVG 1.1 generic feature sets
// lack of Font and Filter support.
// http://bugs.webkit.org/show_bug.cgi?id=15480
-#if ENABLE(SVG_USE) && ENABLE(SVG_FOREIGN_OBJECT) && ENABLE(SVG_FILTER) && ENABLE(SVG_FONTS)
+#if ENABLE(SVG_USE) && ENABLE(SVG_FOREIGN_OBJECT) && ENABLE(FILTERS) && ENABLE(SVG_FONTS)
addString(svgFeatures, "SVG");
addString(svgFeatures, "SVGDOM");
addString(svgFeatures, "SVG-static");
@@ -141,7 +141,7 @@
addString(svgFeatures, "Clip");
addString(svgFeatures, "BasicClip");
addString(svgFeatures, "Mask");
-#if ENABLE(SVG_FILTER)
+#if ENABLE(FILTERS)
// addString(svgFeatures, "Filter");
addString(svgFeatures, "BasicFilter");
#endif
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 8f3a2b1..12d47a3 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -453,9 +453,8 @@
attribute SVGTransformConstructor SVGTransform;
attribute SVGUnitTypesConstructor SVGUnitTypes;
// attribute SVGZoomAndPanConstructor SVGZoomAndPan;
-#endif
-#if defined(ENABLE_SVG_FILTERS) && ENABLE_SVG_FILTERS
+#if defined(ENABLE_FILTERS) && ENABLE_FILTERS
attribute SVGComponentTransferFunctionElementConstructor SVGComponentTransferFunctionElement;
attribute SVGFEBlendElementConstructor SVGFEBlendElement;
attribute SVGFEColorMatrixElementConstructor SVGFEColorMatrixElement;
@@ -465,6 +464,7 @@
// attribute SVGFEMorphologyElementConstructor SVGFEMorphologyElement;
attribute SVGFETurbulenceElementConstructor SVGFETurbulenceElement;
#endif
+#endif
#endif // defined(LANGUAGE_JAVASCRIPT)
diff --git a/WebCore/platform/graphics/filters/FEBlend.cpp b/WebCore/platform/graphics/filters/FEBlend.cpp
index 8763225..1013b33 100644
--- a/WebCore/platform/graphics/filters/FEBlend.cpp
+++ b/WebCore/platform/graphics/filters/FEBlend.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FEBlend.h"
#include "SVGResourceFilter.h"
@@ -71,4 +71,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
diff --git a/WebCore/platform/graphics/filters/FEBlend.h b/WebCore/platform/graphics/filters/FEBlend.h
index 25ee379..8014aa7 100644
--- a/WebCore/platform/graphics/filters/FEBlend.h
+++ b/WebCore/platform/graphics/filters/FEBlend.h
@@ -22,7 +22,7 @@
#ifndef SVGFEBlend_h
#define SVGFEBlend_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -61,6 +61,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
#endif // SVGFEBlend_h
diff --git a/WebCore/platform/graphics/filters/FEColorMatrix.cpp b/WebCore/platform/graphics/filters/FEColorMatrix.cpp
index 4340c82..0d7dd69 100644
--- a/WebCore/platform/graphics/filters/FEColorMatrix.cpp
+++ b/WebCore/platform/graphics/filters/FEColorMatrix.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FEColorMatrix.h"
#include "SVGResourceFilter.h"
@@ -71,4 +71,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
diff --git a/WebCore/platform/graphics/filters/FEColorMatrix.h b/WebCore/platform/graphics/filters/FEColorMatrix.h
index 0dd7fd0..b52fea6 100644
--- a/WebCore/platform/graphics/filters/FEColorMatrix.h
+++ b/WebCore/platform/graphics/filters/FEColorMatrix.h
@@ -22,7 +22,7 @@
#ifndef SVGFEColorMatrix_h
#define SVGFEColorMatrix_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -61,6 +61,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
#endif // SVGFEColorMatrix_h
diff --git a/WebCore/platform/graphics/filters/FEComponentTransfer.cpp b/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
index 880ab56..75a14c4 100644
--- a/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
+++ b/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FEComponentTransfer.h"
#include "SVGResourceFilter.h"
@@ -95,4 +95,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
diff --git a/WebCore/platform/graphics/filters/FEComponentTransfer.h b/WebCore/platform/graphics/filters/FEComponentTransfer.h
index b045aaf..9944c75 100644
--- a/WebCore/platform/graphics/filters/FEComponentTransfer.h
+++ b/WebCore/platform/graphics/filters/FEComponentTransfer.h
@@ -22,7 +22,7 @@
#ifndef SVGFEComponentTransfer_h
#define SVGFEComponentTransfer_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGFEDisplacementMap.h"
@@ -95,6 +95,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
#endif // SVGFEComponentTransfer_h
diff --git a/WebCore/platform/graphics/filters/FEComposite.cpp b/WebCore/platform/graphics/filters/FEComposite.cpp
index 16aaec6..1b8922f 100644
--- a/WebCore/platform/graphics/filters/FEComposite.cpp
+++ b/WebCore/platform/graphics/filters/FEComposite.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FEComposite.h"
#include "SVGResourceFilter.h"
@@ -107,4 +107,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
diff --git a/WebCore/platform/graphics/filters/FEComposite.h b/WebCore/platform/graphics/filters/FEComposite.h
index 48c62a7..fef877f 100644
--- a/WebCore/platform/graphics/filters/FEComposite.h
+++ b/WebCore/platform/graphics/filters/FEComposite.h
@@ -22,7 +22,7 @@
#ifndef SVGFEComposite_h
#define SVGFEComposite_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FilterEffect.h"
#include "PlatformString.h"
@@ -78,6 +78,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
#endif // SVGFEComposite_h
diff --git a/WebCore/platform/graphics/filters/FilterEffect.cpp b/WebCore/platform/graphics/filters/FilterEffect.cpp
index e08cd37..cd74992 100644
--- a/WebCore/platform/graphics/filters/FilterEffect.cpp
+++ b/WebCore/platform/graphics/filters/FilterEffect.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FilterEffect.h"
namespace WebCore {
@@ -43,4 +43,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
diff --git a/WebCore/platform/graphics/filters/FilterEffect.h b/WebCore/platform/graphics/filters/FilterEffect.h
index d2120ad..5ad5ee0 100644
--- a/WebCore/platform/graphics/filters/FilterEffect.h
+++ b/WebCore/platform/graphics/filters/FilterEffect.h
@@ -21,7 +21,7 @@
#ifndef FilterEffect_h
#define FilterEffect_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FloatRect.h"
#include "ImageBuffer.h"
#include "SVGResourceFilter.h"
@@ -77,6 +77,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
#endif // FilterEffect_h
diff --git a/WebCore/platform/graphics/filters/SourceAlpha.cpp b/WebCore/platform/graphics/filters/SourceAlpha.cpp
index 4bbd5b3..d3ccd86 100644
--- a/WebCore/platform/graphics/filters/SourceAlpha.cpp
+++ b/WebCore/platform/graphics/filters/SourceAlpha.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "SourceAlpha.h"
#include "GraphicsContext.h"
@@ -51,4 +51,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
diff --git a/WebCore/platform/graphics/filters/SourceAlpha.h b/WebCore/platform/graphics/filters/SourceAlpha.h
index 3009bef..dbb0f79 100644
--- a/WebCore/platform/graphics/filters/SourceAlpha.h
+++ b/WebCore/platform/graphics/filters/SourceAlpha.h
@@ -20,7 +20,7 @@
#ifndef SourceAlpha_h
#define SourceAlpha_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FilterEffect.h"
#include "PlatformString.h"
@@ -42,6 +42,6 @@
};
} //namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
#endif // SourceAlpha_h
diff --git a/WebCore/platform/graphics/filters/SourceGraphic.cpp b/WebCore/platform/graphics/filters/SourceGraphic.cpp
index 0a149be..7d0d298 100644
--- a/WebCore/platform/graphics/filters/SourceGraphic.cpp
+++ b/WebCore/platform/graphics/filters/SourceGraphic.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "SourceGraphic.h"
#include "GraphicsContext.h"
@@ -51,4 +51,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
diff --git a/WebCore/platform/graphics/filters/SourceGraphic.h b/WebCore/platform/graphics/filters/SourceGraphic.h
index 14e8456..79a408c 100644
--- a/WebCore/platform/graphics/filters/SourceGraphic.h
+++ b/WebCore/platform/graphics/filters/SourceGraphic.h
@@ -21,7 +21,7 @@
#ifndef SourceGraphic_h
#define SourceGrahpic_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "FilterEffect.h"
#include "PlatformString.h"
@@ -43,6 +43,6 @@
};
} //namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(FILTERS)
#endif // SourceGraphic_h
diff --git a/WebCore/rendering/RenderSVGContainer.cpp b/WebCore/rendering/RenderSVGContainer.cpp
index b617a6c..804fc5f 100644
--- a/WebCore/rendering/RenderSVGContainer.cpp
+++ b/WebCore/rendering/RenderSVGContainer.cpp
@@ -84,7 +84,7 @@
bool RenderSVGContainer::selfWillPaint() const
{
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
const SVGRenderStyle* svgStyle = style()->svgStyle();
SVGResourceFilter* filter = getFilterById(document(), svgStyle->filter());
if (filter)
diff --git a/WebCore/rendering/RenderSVGModelObject.cpp b/WebCore/rendering/RenderSVGModelObject.cpp
index d27a93c..3fab5a6 100644
--- a/WebCore/rendering/RenderSVGModelObject.cpp
+++ b/WebCore/rendering/RenderSVGModelObject.cpp
@@ -38,7 +38,7 @@
#include "RenderView.h"
#include "SVGStyledElement.h"
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "SVGResourceFilter.h"
#endif
diff --git a/WebCore/rendering/RenderSVGRoot.cpp b/WebCore/rendering/RenderSVGRoot.cpp
index 562d90f..d683378 100644
--- a/WebCore/rendering/RenderSVGRoot.cpp
+++ b/WebCore/rendering/RenderSVGRoot.cpp
@@ -34,7 +34,7 @@
#include "SVGStyledElement.h"
#include "TransformState.h"
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
#include "SVGResourceFilter.h"
#endif
@@ -115,7 +115,7 @@
bool RenderSVGRoot::selfWillPaint() const
{
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
const SVGRenderStyle* svgStyle = style()->svgStyle();
SVGResourceFilter* filter = getFilterById(document(), svgStyle->filter());
if (filter)
diff --git a/WebCore/rendering/SVGRenderSupport.cpp b/WebCore/rendering/SVGRenderSupport.cpp
index 9b481e3..fa857fc 100644
--- a/WebCore/rendering/SVGRenderSupport.cpp
+++ b/WebCore/rendering/SVGRenderSupport.cpp
@@ -71,7 +71,7 @@
void SVGRenderBase::prepareToRenderSVGContent(RenderObject* object, RenderObject::PaintInfo& paintInfo, const FloatRect& boundingBox, SVGResourceFilter*& filter, SVGResourceFilter* rootFilter)
{
-#if !ENABLE(SVG_FILTERS)
+#if !ENABLE(FILTERS)
UNUSED_PARAM(filter);
UNUSED_PARAM(rootFilter);
#endif
@@ -94,7 +94,7 @@
paintInfo.context->beginTransparencyLayer(opacity);
}
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
AtomicString filterId(svgStyle->filter());
#endif
@@ -103,7 +103,7 @@
Document* document = object->document();
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
SVGResourceFilter* newFilter = getFilterById(document, filterId);
if (newFilter == rootFilter) {
// Catch <text filter="url(#foo)">Test<tspan filter="url(#foo)">123</tspan></text>.
@@ -117,7 +117,7 @@
SVGResourceClipper* clipper = getClipperById(document, clipperId);
SVGResourceMasker* masker = getMaskerById(document, maskerId);
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
if (filter) {
filter->addClient(styledElement);
filter->prepareFilter(paintInfo.context, boundingBox);
@@ -140,7 +140,7 @@
void SVGRenderBase::finishRenderSVGContent(RenderObject* object, RenderObject::PaintInfo& paintInfo, const FloatRect& boundingBox, SVGResourceFilter*& filter, GraphicsContext* savedContext)
{
-#if !ENABLE(SVG_FILTERS)
+#if !ENABLE(FILTERS)
UNUSED_PARAM(boundingBox);
UNUSED_PARAM(filter);
UNUSED_PARAM(savedContext);
@@ -151,7 +151,7 @@
const RenderStyle* style = object->style();
ASSERT(style);
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
if (filter) {
filter->applyFilter(paintInfo.context, boundingBox);
paintInfo.context = savedContext;
@@ -216,7 +216,7 @@
FloatRect SVGRenderBase::filterBoundingBoxForRenderer(const RenderObject* object)
{
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(FILTERS)
SVGResourceFilter* filter = getFilterById(object->document(), object->style()->svgStyle()->filter());
if (filter)
return filter->filterBBoxForItemBBox(object->objectBoundingBox());
diff --git a/WebCore/svg/Filter.cpp b/WebCore/svg/Filter.cpp
index 24a9fb8..af74942 100644
--- a/WebCore/svg/Filter.cpp
+++ b/WebCore/svg/Filter.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "Filter.h"
namespace WebCore {
@@ -36,4 +36,4 @@
} //namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/Filter.h b/WebCore/svg/Filter.h
index 7945d5d..87d6b43 100644
--- a/WebCore/svg/Filter.h
+++ b/WebCore/svg/Filter.h
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include <wtf/PassRefPtr.h>
@@ -42,5 +42,5 @@
} //namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif
diff --git a/WebCore/svg/FilterBuilder.cpp b/WebCore/svg/FilterBuilder.cpp
index 98cc67b..f5e79c9 100644
--- a/WebCore/svg/FilterBuilder.cpp
+++ b/WebCore/svg/FilterBuilder.cpp
@@ -20,7 +20,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterBuilder.h"
#include "FilterEffect.h"
@@ -82,4 +82,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/FilterBuilder.h b/WebCore/svg/FilterBuilder.h
index a875cb1..6686f50 100644
--- a/WebCore/svg/FilterBuilder.h
+++ b/WebCore/svg/FilterBuilder.h
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include "PlatformString.h"
@@ -51,5 +51,5 @@
} //namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif
diff --git a/WebCore/svg/SVGComponentTransferFunctionElement.cpp b/WebCore/svg/SVGComponentTransferFunctionElement.cpp
index 62348bd..e479fae 100644
--- a/WebCore/svg/SVGComponentTransferFunctionElement.cpp
+++ b/WebCore/svg/SVGComponentTransferFunctionElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGComponentTransferFunctionElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGComponentTransferFunctionElement.h b/WebCore/svg/SVGComponentTransferFunctionElement.h
index 5e20e37f..82d57b4 100644
--- a/WebCore/svg/SVGComponentTransferFunctionElement.h
+++ b/WebCore/svg/SVGComponentTransferFunctionElement.h
@@ -23,7 +23,7 @@
#ifndef SVGComponentTransferFunctionElement_h
#define SVGComponentTransferFunctionElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGElement.h"
#include "SVGNumberList.h"
#include "FEComponentTransfer.h"
@@ -53,5 +53,5 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif
diff --git a/WebCore/svg/SVGComponentTransferFunctionElement.idl b/WebCore/svg/SVGComponentTransferFunctionElement.idl
index a479aa2..0868175 100644
--- a/WebCore/svg/SVGComponentTransferFunctionElement.idl
+++ b/WebCore/svg/SVGComponentTransferFunctionElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS, GenerateConstructor] SVGComponentTransferFunctionElement : SVGElement {
+ interface [Conditional=SVG&FILTERS, GenerateConstructor] SVGComponentTransferFunctionElement : SVGElement {
// Component Transfer Types
const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN = 0;
const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY = 1;
diff --git a/WebCore/svg/SVGFEBlendElement.cpp b/WebCore/svg/SVGFEBlendElement.cpp
index 4f92442..a41c71e 100644
--- a/WebCore/svg/SVGFEBlendElement.cpp
+++ b/WebCore/svg/SVGFEBlendElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEBlendElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFEBlendElement.h b/WebCore/svg/SVGFEBlendElement.h
index a85d174..4adb6f9 100644
--- a/WebCore/svg/SVGFEBlendElement.h
+++ b/WebCore/svg/SVGFEBlendElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEBlendElement_h
#define SVGFEBlendElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FEBlend.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/SVGFEBlendElement.idl b/WebCore/svg/SVGFEBlendElement.idl
index b45b57f..4c1a18b 100644
--- a/WebCore/svg/SVGFEBlendElement.idl
+++ b/WebCore/svg/SVGFEBlendElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS, GenerateConstructor] SVGFEBlendElement : SVGElement,
+ interface [Conditional=SVG&FILTERS, GenerateConstructor] SVGFEBlendElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
// Blend Mode Types
const unsigned short SVG_FEBLEND_MODE_UNKNOWN = 0;
diff --git a/WebCore/svg/SVGFEColorMatrixElement.cpp b/WebCore/svg/SVGFEColorMatrixElement.cpp
index 81c2300..1df3737 100644
--- a/WebCore/svg/SVGFEColorMatrixElement.cpp
+++ b/WebCore/svg/SVGFEColorMatrixElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEColorMatrixElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFEColorMatrixElement.h b/WebCore/svg/SVGFEColorMatrixElement.h
index f39db86..a6dbc95 100644
--- a/WebCore/svg/SVGFEColorMatrixElement.h
+++ b/WebCore/svg/SVGFEColorMatrixElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEColorMatrixElement_h
#define SVGFEColorMatrixElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FEColorMatrix.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "SVGNumberList.h"
diff --git a/WebCore/svg/SVGFEColorMatrixElement.idl b/WebCore/svg/SVGFEColorMatrixElement.idl
index ae0e293..c116fe7 100644
--- a/WebCore/svg/SVGFEColorMatrixElement.idl
+++ b/WebCore/svg/SVGFEColorMatrixElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS, GenerateConstructor] SVGFEColorMatrixElement : SVGElement,
+ interface [Conditional=SVG&FILTERS, GenerateConstructor] SVGFEColorMatrixElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
// Color Matrix Types
const unsigned short SVG_FECOLORMATRIX_TYPE_UNKNOWN = 0;
diff --git a/WebCore/svg/SVGFEComponentTransferElement.cpp b/WebCore/svg/SVGFEComponentTransferElement.cpp
index 1b645e7..748a2eb 100644
--- a/WebCore/svg/SVGFEComponentTransferElement.cpp
+++ b/WebCore/svg/SVGFEComponentTransferElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEComponentTransferElement.h"
#include "Attr.h"
diff --git a/WebCore/svg/SVGFEComponentTransferElement.h b/WebCore/svg/SVGFEComponentTransferElement.h
index e80ea94..d2a5651 100644
--- a/WebCore/svg/SVGFEComponentTransferElement.h
+++ b/WebCore/svg/SVGFEComponentTransferElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEComponentTransferElement_h
#define SVGFEComponentTransferElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "FEComponentTransfer.h"
diff --git a/WebCore/svg/SVGFEComponentTransferElement.idl b/WebCore/svg/SVGFEComponentTransferElement.idl
index 783c9b7..7ec0741 100644
--- a/WebCore/svg/SVGFEComponentTransferElement.idl
+++ b/WebCore/svg/SVGFEComponentTransferElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEComponentTransferElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFEComponentTransferElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
readonly attribute SVGAnimatedString in1;
};
diff --git a/WebCore/svg/SVGFECompositeElement.cpp b/WebCore/svg/SVGFECompositeElement.cpp
index 733077a..55593c9 100644
--- a/WebCore/svg/SVGFECompositeElement.cpp
+++ b/WebCore/svg/SVGFECompositeElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFECompositeElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFECompositeElement.h b/WebCore/svg/SVGFECompositeElement.h
index 89ad7df..afe17f4 100644
--- a/WebCore/svg/SVGFECompositeElement.h
+++ b/WebCore/svg/SVGFECompositeElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFECompositeElement_h
#define SVGFECompositeElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FEComposite.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/SVGFECompositeElement.idl b/WebCore/svg/SVGFECompositeElement.idl
index 01821e8..97a13fc 100644
--- a/WebCore/svg/SVGFECompositeElement.idl
+++ b/WebCore/svg/SVGFECompositeElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS, GenerateConstructor] SVGFECompositeElement : SVGElement,
+ interface [Conditional=SVG&FILTERS, GenerateConstructor] SVGFECompositeElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
// Composite Operators
const unsigned short SVG_FECOMPOSITE_OPERATOR_UNKNOWN = 0;
diff --git a/WebCore/svg/SVGFEDiffuseLightingElement.cpp b/WebCore/svg/SVGFEDiffuseLightingElement.cpp
index 41ed4fe..c137b69 100644
--- a/WebCore/svg/SVGFEDiffuseLightingElement.cpp
+++ b/WebCore/svg/SVGFEDiffuseLightingElement.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEDiffuseLightingElement.h"
#include "Attr.h"
diff --git a/WebCore/svg/SVGFEDiffuseLightingElement.h b/WebCore/svg/SVGFEDiffuseLightingElement.h
index 70c6777..bf73178 100644
--- a/WebCore/svg/SVGFEDiffuseLightingElement.h
+++ b/WebCore/svg/SVGFEDiffuseLightingElement.h
@@ -22,7 +22,7 @@
#ifndef SVGFEDiffuseLightingElement_h
#define SVGFEDiffuseLightingElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFELightElement.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/SVGFEDiffuseLightingElement.idl b/WebCore/svg/SVGFEDiffuseLightingElement.idl
index ca54f8b..c48a4f1 100644
--- a/WebCore/svg/SVGFEDiffuseLightingElement.idl
+++ b/WebCore/svg/SVGFEDiffuseLightingElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEDiffuseLightingElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFEDiffuseLightingElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber surfaceScale;
diff --git a/WebCore/svg/SVGFEDisplacementMapElement.cpp b/WebCore/svg/SVGFEDisplacementMapElement.cpp
index 522a6d2..a9b8e59 100644
--- a/WebCore/svg/SVGFEDisplacementMapElement.cpp
+++ b/WebCore/svg/SVGFEDisplacementMapElement.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEDisplacementMapElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFEDisplacementMapElement.h b/WebCore/svg/SVGFEDisplacementMapElement.h
index 21b93f4..e8fdc64 100644
--- a/WebCore/svg/SVGFEDisplacementMapElement.h
+++ b/WebCore/svg/SVGFEDisplacementMapElement.h
@@ -20,7 +20,7 @@
#ifndef SVGFEDisplacementMapElement_h
#define SVGFEDisplacementMapElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEDisplacementMap.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/SVGFEDisplacementMapElement.idl b/WebCore/svg/SVGFEDisplacementMapElement.idl
index d819794..4fde219 100644
--- a/WebCore/svg/SVGFEDisplacementMapElement.idl
+++ b/WebCore/svg/SVGFEDisplacementMapElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS, GenerateConstructor] SVGFEDisplacementMapElement : SVGElement,
+ interface [Conditional=SVG&FILTERS, GenerateConstructor] SVGFEDisplacementMapElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
// Channel Selectors
const unsigned short SVG_CHANNEL_UNKNOWN = 0;
diff --git a/WebCore/svg/SVGFEDistantLightElement.cpp b/WebCore/svg/SVGFEDistantLightElement.cpp
index e9ec48d..35c487b 100644
--- a/WebCore/svg/SVGFEDistantLightElement.cpp
+++ b/WebCore/svg/SVGFEDistantLightElement.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEDistantLightElement.h"
#include "SVGDistantLightSource.h"
diff --git a/WebCore/svg/SVGFEDistantLightElement.h b/WebCore/svg/SVGFEDistantLightElement.h
index e43282f..e340549 100644
--- a/WebCore/svg/SVGFEDistantLightElement.h
+++ b/WebCore/svg/SVGFEDistantLightElement.h
@@ -20,7 +20,7 @@
#ifndef SVGFEDistantLightElement_h
#define SVGFEDistantLightElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFELightElement.h"
namespace WebCore
diff --git a/WebCore/svg/SVGFEDistantLightElement.idl b/WebCore/svg/SVGFEDistantLightElement.idl
index 8bd6067..16e7467 100644
--- a/WebCore/svg/SVGFEDistantLightElement.idl
+++ b/WebCore/svg/SVGFEDistantLightElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEDistantLightElement : SVGElement {
+ interface [Conditional=SVG&FILTERS] SVGFEDistantLightElement : SVGElement {
readonly attribute SVGAnimatedNumber azimuth;
readonly attribute SVGAnimatedNumber elevation;
};
diff --git a/WebCore/svg/SVGFEFloodElement.cpp b/WebCore/svg/SVGFEFloodElement.cpp
index 98e7d6f..2d70b14 100644
--- a/WebCore/svg/SVGFEFloodElement.cpp
+++ b/WebCore/svg/SVGFEFloodElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEFloodElement.h"
#include "Attr.h"
diff --git a/WebCore/svg/SVGFEFloodElement.h b/WebCore/svg/SVGFEFloodElement.h
index 046f418..b692162 100644
--- a/WebCore/svg/SVGFEFloodElement.h
+++ b/WebCore/svg/SVGFEFloodElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEFloodElement_h
#define SVGFEFloodElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "SVGFEFlood.h"
diff --git a/WebCore/svg/SVGFEFloodElement.idl b/WebCore/svg/SVGFEFloodElement.idl
index d2356bf..6aeab20 100644
--- a/WebCore/svg/SVGFEFloodElement.idl
+++ b/WebCore/svg/SVGFEFloodElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEFloodElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFEFloodElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
};
diff --git a/WebCore/svg/SVGFEFuncAElement.cpp b/WebCore/svg/SVGFEFuncAElement.cpp
index 595e2e6..41118fe 100644
--- a/WebCore/svg/SVGFEFuncAElement.cpp
+++ b/WebCore/svg/SVGFEFuncAElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEFuncAElement.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEFuncAElement.h b/WebCore/svg/SVGFEFuncAElement.h
index 3fd6816..2c24039 100644
--- a/WebCore/svg/SVGFEFuncAElement.h
+++ b/WebCore/svg/SVGFEFuncAElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEFuncAElement_h
#define SVGFEFuncAElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGComponentTransferFunctionElement.h"
namespace WebCore
diff --git a/WebCore/svg/SVGFEFuncAElement.idl b/WebCore/svg/SVGFEFuncAElement.idl
index 7675f7d..8901551 100644
--- a/WebCore/svg/SVGFEFuncAElement.idl
+++ b/WebCore/svg/SVGFEFuncAElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEFuncAElement : SVGComponentTransferFunctionElement {
+ interface [Conditional=SVG&FILTERS] SVGFEFuncAElement : SVGComponentTransferFunctionElement {
};
}
diff --git a/WebCore/svg/SVGFEFuncBElement.cpp b/WebCore/svg/SVGFEFuncBElement.cpp
index de6cb88..190b23a 100644
--- a/WebCore/svg/SVGFEFuncBElement.cpp
+++ b/WebCore/svg/SVGFEFuncBElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEFuncBElement.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEFuncBElement.h b/WebCore/svg/SVGFEFuncBElement.h
index 2dd9615..1eb0889 100644
--- a/WebCore/svg/SVGFEFuncBElement.h
+++ b/WebCore/svg/SVGFEFuncBElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEFuncBElement_h
#define SVGFEFuncBElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGComponentTransferFunctionElement.h"
namespace WebCore
diff --git a/WebCore/svg/SVGFEFuncBElement.idl b/WebCore/svg/SVGFEFuncBElement.idl
index 7717f6a..fada028 100644
--- a/WebCore/svg/SVGFEFuncBElement.idl
+++ b/WebCore/svg/SVGFEFuncBElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEFuncBElement : SVGComponentTransferFunctionElement {
+ interface [Conditional=SVG&FILTERS] SVGFEFuncBElement : SVGComponentTransferFunctionElement {
};
}
diff --git a/WebCore/svg/SVGFEFuncGElement.cpp b/WebCore/svg/SVGFEFuncGElement.cpp
index 958f547..d5e5625 100644
--- a/WebCore/svg/SVGFEFuncGElement.cpp
+++ b/WebCore/svg/SVGFEFuncGElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEFuncGElement.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEFuncGElement.h b/WebCore/svg/SVGFEFuncGElement.h
index 8f1c368..973360e 100644
--- a/WebCore/svg/SVGFEFuncGElement.h
+++ b/WebCore/svg/SVGFEFuncGElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEFuncGElement_h
#define SVGFEFuncGElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGComponentTransferFunctionElement.h"
namespace WebCore
diff --git a/WebCore/svg/SVGFEFuncGElement.idl b/WebCore/svg/SVGFEFuncGElement.idl
index 1ec24fa..33fc9a0 100644
--- a/WebCore/svg/SVGFEFuncGElement.idl
+++ b/WebCore/svg/SVGFEFuncGElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEFuncGElement : SVGComponentTransferFunctionElement {
+ interface [Conditional=SVG&FILTERS] SVGFEFuncGElement : SVGComponentTransferFunctionElement {
};
}
diff --git a/WebCore/svg/SVGFEFuncRElement.cpp b/WebCore/svg/SVGFEFuncRElement.cpp
index e376781..e3d7ee4 100644
--- a/WebCore/svg/SVGFEFuncRElement.cpp
+++ b/WebCore/svg/SVGFEFuncRElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEFuncRElement.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEFuncRElement.h b/WebCore/svg/SVGFEFuncRElement.h
index 4921488..3553954 100644
--- a/WebCore/svg/SVGFEFuncRElement.h
+++ b/WebCore/svg/SVGFEFuncRElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEFuncRElement_h
#define SVGFEFuncRElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGComponentTransferFunctionElement.h"
namespace WebCore
diff --git a/WebCore/svg/SVGFEFuncRElement.idl b/WebCore/svg/SVGFEFuncRElement.idl
index 0a6ac30..e9b8e26 100644
--- a/WebCore/svg/SVGFEFuncRElement.idl
+++ b/WebCore/svg/SVGFEFuncRElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEFuncRElement : SVGComponentTransferFunctionElement {
+ interface [Conditional=SVG&FILTERS] SVGFEFuncRElement : SVGComponentTransferFunctionElement {
};
}
diff --git a/WebCore/svg/SVGFEGaussianBlurElement.cpp b/WebCore/svg/SVGFEGaussianBlurElement.cpp
index c6341b7..91f1c31 100644
--- a/WebCore/svg/SVGFEGaussianBlurElement.cpp
+++ b/WebCore/svg/SVGFEGaussianBlurElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEGaussianBlurElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFEGaussianBlurElement.h b/WebCore/svg/SVGFEGaussianBlurElement.h
index 9e1c15c..d005742 100644
--- a/WebCore/svg/SVGFEGaussianBlurElement.h
+++ b/WebCore/svg/SVGFEGaussianBlurElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEGaussianBlurElement_h
#define SVGFEGaussianBlurElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEGaussianBlur.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/SVGFEGaussianBlurElement.idl b/WebCore/svg/SVGFEGaussianBlurElement.idl
index 7dc7526..efa09b8 100644
--- a/WebCore/svg/SVGFEGaussianBlurElement.idl
+++ b/WebCore/svg/SVGFEGaussianBlurElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEGaussianBlurElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFEGaussianBlurElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber stdDeviationX;
diff --git a/WebCore/svg/SVGFEImageElement.cpp b/WebCore/svg/SVGFEImageElement.cpp
index c8bd712..a917987 100644
--- a/WebCore/svg/SVGFEImageElement.cpp
+++ b/WebCore/svg/SVGFEImageElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEImageElement.h"
#include "Attr.h"
diff --git a/WebCore/svg/SVGFEImageElement.h b/WebCore/svg/SVGFEImageElement.h
index 98d5941..ad14f7f 100644
--- a/WebCore/svg/SVGFEImageElement.h
+++ b/WebCore/svg/SVGFEImageElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEImageElement_h
#define SVGFEImageElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "CachedResourceHandle.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "SVGURIReference.h"
diff --git a/WebCore/svg/SVGFEImageElement.idl b/WebCore/svg/SVGFEImageElement.idl
index c9ee669..23b9c86 100644
--- a/WebCore/svg/SVGFEImageElement.idl
+++ b/WebCore/svg/SVGFEImageElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEImageElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFEImageElement : SVGElement,
SVGURIReference,
SVGLangSpace,
SVGExternalResourcesRequired,
diff --git a/WebCore/svg/SVGFELightElement.cpp b/WebCore/svg/SVGFELightElement.cpp
index 53f3293..bb954eb 100644
--- a/WebCore/svg/SVGFELightElement.cpp
+++ b/WebCore/svg/SVGFELightElement.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFELightElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFELightElement.h b/WebCore/svg/SVGFELightElement.h
index 5c4a785..a66ccf5 100644
--- a/WebCore/svg/SVGFELightElement.h
+++ b/WebCore/svg/SVGFELightElement.h
@@ -22,7 +22,7 @@
#ifndef SVGFELightElement_h
#define SVGFELightElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGElement.h"
#include "SVGLightSource.h"
@@ -56,5 +56,5 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif
diff --git a/WebCore/svg/SVGFEMergeElement.cpp b/WebCore/svg/SVGFEMergeElement.cpp
index 5ccf403..cb6c9e5 100644
--- a/WebCore/svg/SVGFEMergeElement.cpp
+++ b/WebCore/svg/SVGFEMergeElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEMergeElement.h"
#include "SVGFEMergeNodeElement.h"
diff --git a/WebCore/svg/SVGFEMergeElement.h b/WebCore/svg/SVGFEMergeElement.h
index 6449286..db7fdcc 100644
--- a/WebCore/svg/SVGFEMergeElement.h
+++ b/WebCore/svg/SVGFEMergeElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEMergeElement_h
#define SVGFEMergeElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEMerge.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/SVGFEMergeElement.idl b/WebCore/svg/SVGFEMergeElement.idl
index 6cec2fc..0b03845 100644
--- a/WebCore/svg/SVGFEMergeElement.idl
+++ b/WebCore/svg/SVGFEMergeElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEMergeElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFEMergeElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
};
diff --git a/WebCore/svg/SVGFEMergeNodeElement.cpp b/WebCore/svg/SVGFEMergeNodeElement.cpp
index 18a532d..ae08706 100644
--- a/WebCore/svg/SVGFEMergeNodeElement.cpp
+++ b/WebCore/svg/SVGFEMergeNodeElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEMergeNodeElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFEMergeNodeElement.h b/WebCore/svg/SVGFEMergeNodeElement.h
index c1abd2f..e2af642 100644
--- a/WebCore/svg/SVGFEMergeNodeElement.h
+++ b/WebCore/svg/SVGFEMergeNodeElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEMergeNodeElement_h
#define SVGFEMergeNodeElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGElement.h"
namespace WebCore {
diff --git a/WebCore/svg/SVGFEMergeNodeElement.idl b/WebCore/svg/SVGFEMergeNodeElement.idl
index f385755..4bddcb2 100644
--- a/WebCore/svg/SVGFEMergeNodeElement.idl
+++ b/WebCore/svg/SVGFEMergeNodeElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEMergeNodeElement : SVGElement {
+ interface [Conditional=SVG&FILTERS] SVGFEMergeNodeElement : SVGElement {
readonly attribute SVGAnimatedString in1;
};
diff --git a/WebCore/svg/SVGFEOffsetElement.cpp b/WebCore/svg/SVGFEOffsetElement.cpp
index e28e052..687f39c 100644
--- a/WebCore/svg/SVGFEOffsetElement.cpp
+++ b/WebCore/svg/SVGFEOffsetElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEOffsetElement.h"
#include "Attr.h"
diff --git a/WebCore/svg/SVGFEOffsetElement.h b/WebCore/svg/SVGFEOffsetElement.h
index 2d1b0ba..6b1cf44 100644
--- a/WebCore/svg/SVGFEOffsetElement.h
+++ b/WebCore/svg/SVGFEOffsetElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFEOffsetElement_h
#define SVGFEOffsetElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "SVGFEOffset.h"
diff --git a/WebCore/svg/SVGFEOffsetElement.idl b/WebCore/svg/SVGFEOffsetElement.idl
index a62d8da..ba3ee4e 100644
--- a/WebCore/svg/SVGFEOffsetElement.idl
+++ b/WebCore/svg/SVGFEOffsetElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEOffsetElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFEOffsetElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber dx;
diff --git a/WebCore/svg/SVGFEPointLightElement.cpp b/WebCore/svg/SVGFEPointLightElement.cpp
index f30f6db..088f878 100644
--- a/WebCore/svg/SVGFEPointLightElement.cpp
+++ b/WebCore/svg/SVGFEPointLightElement.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEPointLightElement.h"
#include "SVGPointLightSource.h"
diff --git a/WebCore/svg/SVGFEPointLightElement.h b/WebCore/svg/SVGFEPointLightElement.h
index 5b72e09..edb9f9d 100644
--- a/WebCore/svg/SVGFEPointLightElement.h
+++ b/WebCore/svg/SVGFEPointLightElement.h
@@ -20,7 +20,7 @@
#ifndef SVGFEPointLightElement_h
#define SVGFEPointLightElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFELightElement.h"
namespace WebCore
diff --git a/WebCore/svg/SVGFEPointLightElement.idl b/WebCore/svg/SVGFEPointLightElement.idl
index 12dbe2f..f5ad94c 100644
--- a/WebCore/svg/SVGFEPointLightElement.idl
+++ b/WebCore/svg/SVGFEPointLightElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFEPointLightElement : SVGElement {
+ interface [Conditional=SVG&FILTERS] SVGFEPointLightElement : SVGElement {
readonly attribute SVGAnimatedNumber x;
readonly attribute SVGAnimatedNumber y;
readonly attribute SVGAnimatedNumber z;
diff --git a/WebCore/svg/SVGFESpecularLightingElement.cpp b/WebCore/svg/SVGFESpecularLightingElement.cpp
index a202282..df98d3b 100644
--- a/WebCore/svg/SVGFESpecularLightingElement.cpp
+++ b/WebCore/svg/SVGFESpecularLightingElement.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFESpecularLightingElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFESpecularLightingElement.h b/WebCore/svg/SVGFESpecularLightingElement.h
index d76cb43..beb1fee7 100644
--- a/WebCore/svg/SVGFESpecularLightingElement.h
+++ b/WebCore/svg/SVGFESpecularLightingElement.h
@@ -22,7 +22,7 @@
#ifndef SVGFESpecularLightingElement_h
#define SVGFESpecularLightingElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFESpecularLighting.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/SVGFESpecularLightingElement.idl b/WebCore/svg/SVGFESpecularLightingElement.idl
index d79a70e..5fce7fa 100644
--- a/WebCore/svg/SVGFESpecularLightingElement.idl
+++ b/WebCore/svg/SVGFESpecularLightingElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFESpecularLightingElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFESpecularLightingElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber surfaceScale;
diff --git a/WebCore/svg/SVGFESpotLightElement.cpp b/WebCore/svg/SVGFESpotLightElement.cpp
index 5add579..980a3bb 100644
--- a/WebCore/svg/SVGFESpotLightElement.cpp
+++ b/WebCore/svg/SVGFESpotLightElement.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFESpotLightElement.h"
#include "SVGSpotLightSource.h"
diff --git a/WebCore/svg/SVGFESpotLightElement.h b/WebCore/svg/SVGFESpotLightElement.h
index 2989b14..629e51a 100644
--- a/WebCore/svg/SVGFESpotLightElement.h
+++ b/WebCore/svg/SVGFESpotLightElement.h
@@ -20,7 +20,7 @@
#ifndef SVGFESpotLightElement_h
#define SVGFESpotLightElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFELightElement.h"
namespace WebCore
diff --git a/WebCore/svg/SVGFESpotLightElement.idl b/WebCore/svg/SVGFESpotLightElement.idl
index 339d545..5a41202 100644
--- a/WebCore/svg/SVGFESpotLightElement.idl
+++ b/WebCore/svg/SVGFESpotLightElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFESpotLightElement : SVGElement {
+ interface [Conditional=SVG&FILTERS] SVGFESpotLightElement : SVGElement {
readonly attribute SVGAnimatedNumber x;
readonly attribute SVGAnimatedNumber y;
readonly attribute SVGAnimatedNumber z;
diff --git a/WebCore/svg/SVGFETileElement.cpp b/WebCore/svg/SVGFETileElement.cpp
index 5a5426f..2c0514a 100644
--- a/WebCore/svg/SVGFETileElement.cpp
+++ b/WebCore/svg/SVGFETileElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFETileElement.h"
#include "Attr.h"
diff --git a/WebCore/svg/SVGFETileElement.h b/WebCore/svg/SVGFETileElement.h
index ba68115..6b5973b 100644
--- a/WebCore/svg/SVGFETileElement.h
+++ b/WebCore/svg/SVGFETileElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFETileElement_h
#define SVGFETileElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "SVGFETile.h"
diff --git a/WebCore/svg/SVGFETileElement.idl b/WebCore/svg/SVGFETileElement.idl
index 68bfcc5..4a59a05 100644
--- a/WebCore/svg/SVGFETileElement.idl
+++ b/WebCore/svg/SVGFETileElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFETileElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFETileElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
readonly attribute SVGAnimatedString in1;
};
diff --git a/WebCore/svg/SVGFETurbulenceElement.cpp b/WebCore/svg/SVGFETurbulenceElement.cpp
index 0e0c63f..af52e5d 100644
--- a/WebCore/svg/SVGFETurbulenceElement.cpp
+++ b/WebCore/svg/SVGFETurbulenceElement.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFETurbulenceElement.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFETurbulenceElement.h b/WebCore/svg/SVGFETurbulenceElement.h
index bae2d9b..6354e61 100644
--- a/WebCore/svg/SVGFETurbulenceElement.h
+++ b/WebCore/svg/SVGFETurbulenceElement.h
@@ -23,7 +23,7 @@
#ifndef SVGFETurbulenceElement_h
#define SVGFETurbulenceElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFETurbulence.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/SVGFETurbulenceElement.idl b/WebCore/svg/SVGFETurbulenceElement.idl
index 79fc63f..9cec66c 100644
--- a/WebCore/svg/SVGFETurbulenceElement.idl
+++ b/WebCore/svg/SVGFETurbulenceElement.idl
@@ -25,7 +25,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS, GenerateConstructor] SVGFETurbulenceElement : SVGElement,
+ interface [Conditional=SVG&FILTERS, GenerateConstructor] SVGFETurbulenceElement : SVGElement,
SVGFilterPrimitiveStandardAttributes {
// Turbulence Types
const unsigned short SVG_TURBULENCE_TYPE_UNKNOWN = 0;
diff --git a/WebCore/svg/SVGFilterElement.cpp b/WebCore/svg/SVGFilterElement.cpp
index ada2361..578d585 100644
--- a/WebCore/svg/SVGFilterElement.cpp
+++ b/WebCore/svg/SVGFilterElement.cpp
@@ -23,7 +23,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterElement.h"
#include "Attr.h"
diff --git a/WebCore/svg/SVGFilterElement.h b/WebCore/svg/SVGFilterElement.h
index c907b9c..541ec14 100644
--- a/WebCore/svg/SVGFilterElement.h
+++ b/WebCore/svg/SVGFilterElement.h
@@ -24,7 +24,7 @@
#ifndef SVGFilterElement_h
#define SVGFilterElement_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGResourceFilter.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
diff --git a/WebCore/svg/SVGFilterElement.idl b/WebCore/svg/SVGFilterElement.idl
index 9d1e15a..10b4f5e 100644
--- a/WebCore/svg/SVGFilterElement.idl
+++ b/WebCore/svg/SVGFilterElement.idl
@@ -26,7 +26,7 @@
module svg {
- interface [Conditional=SVG&SVG_FILTERS] SVGFilterElement : SVGElement,
+ interface [Conditional=SVG&FILTERS] SVGFilterElement : SVGElement,
SVGURIReference,
SVGLangSpace,
SVGExternalResourcesRequired,
diff --git a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
index 610e39a..32e58cb 100644
--- a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
+++ b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "MappedAttribute.h"
diff --git a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
index bbdeb00..d7d780c 100644
--- a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
+++ b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
@@ -23,7 +23,7 @@
#ifndef SVGFilterPrimitiveStandardAttributes_h
#define SVGFilterPrimitiveStandardAttributes_h
-#if ENABLE(SVG)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterBuilder.h"
#include "SVGStyledElement.h"
diff --git a/WebCore/svg/graphics/SVGResourceFilter.cpp b/WebCore/svg/graphics/SVGResourceFilter.cpp
index 8fb2dfa..62094e2 100644
--- a/WebCore/svg/graphics/SVGResourceFilter.cpp
+++ b/WebCore/svg/graphics/SVGResourceFilter.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGResourceFilter.h"
#include "SVGRenderTreeAsText.h"
diff --git a/WebCore/svg/graphics/SVGResourceFilter.h b/WebCore/svg/graphics/SVGResourceFilter.h
index 646c732..15185f8 100644
--- a/WebCore/svg/graphics/SVGResourceFilter.h
+++ b/WebCore/svg/graphics/SVGResourceFilter.h
@@ -22,7 +22,7 @@
#ifndef SVGResourceFilter_h
#define SVGResourceFilter_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGResource.h"
#include "SVGFilterEffect.h"
diff --git a/WebCore/svg/graphics/cairo/SVGResourceFilterCairo.cpp b/WebCore/svg/graphics/cairo/SVGResourceFilterCairo.cpp
index a27038a..13d54b2 100644
--- a/WebCore/svg/graphics/cairo/SVGResourceFilterCairo.cpp
+++ b/WebCore/svg/graphics/cairo/SVGResourceFilterCairo.cpp
@@ -18,7 +18,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "NotImplemented.h"
#include "SVGResourceFilter.h"
diff --git a/WebCore/svg/graphics/cg/SVGResourceFilterCg.cpp b/WebCore/svg/graphics/cg/SVGResourceFilterCg.cpp
index ecfcdd8..7cdb439 100644
--- a/WebCore/svg/graphics/cg/SVGResourceFilterCg.cpp
+++ b/WebCore/svg/graphics/cg/SVGResourceFilterCg.cpp
@@ -27,7 +27,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "NotImplemented.h"
#include "SVGResourceFilter.h"
@@ -50,4 +50,4 @@
}
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/cg/SVGResourceFilterCg.mm b/WebCore/svg/graphics/cg/SVGResourceFilterCg.mm
index a89ec1d..bb4e145 100644
--- a/WebCore/svg/graphics/cg/SVGResourceFilterCg.mm
+++ b/WebCore/svg/graphics/cg/SVGResourceFilterCg.mm
@@ -26,7 +26,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGResourceFilter.h"
#include "TransformationMatrix.h"
@@ -140,4 +140,4 @@
}
-#endif // ENABLE(SVG) ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGDistantLightSource.h b/WebCore/svg/graphics/filters/SVGDistantLightSource.h
index 25c2045..07ac16c 100644
--- a/WebCore/svg/graphics/filters/SVGDistantLightSource.h
+++ b/WebCore/svg/graphics/filters/SVGDistantLightSource.h
@@ -23,7 +23,7 @@
#ifndef SVGDistantLightSource_h
#define SVGDistantLightSource_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGLightSource.h"
namespace WebCore {
@@ -48,6 +48,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGDistantLightSource_h
diff --git a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp b/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp
index 232b8af..a9ad33d 100644
--- a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEConvolveMatrix.h"
#include "SVGResourceFilter.h"
#include "SVGRenderTreeAsText.h"
@@ -175,4 +175,4 @@
}; // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.h b/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.h
index 891c706..7f314e7 100644
--- a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.h
+++ b/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.h
@@ -22,7 +22,7 @@
#ifndef SVGFEConvolveMatrix_h
#define SVGFEConvolveMatrix_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include "FloatPoint.h"
#include "FloatSize.h"
@@ -90,6 +90,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEConvolveMatrix_h
diff --git a/WebCore/svg/graphics/filters/SVGFEDiffuseLighting.cpp b/WebCore/svg/graphics/filters/SVGFEDiffuseLighting.cpp
index bbe9054..aeee137 100644
--- a/WebCore/svg/graphics/filters/SVGFEDiffuseLighting.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEDiffuseLighting.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGLightSource.h"
#include "SVGFEDiffuseLighting.h"
#include "SVGRenderTreeAsText.h"
@@ -133,4 +133,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEDiffuseLighting.h b/WebCore/svg/graphics/filters/SVGFEDiffuseLighting.h
index 88ff882..dd9b09f 100644
--- a/WebCore/svg/graphics/filters/SVGFEDiffuseLighting.h
+++ b/WebCore/svg/graphics/filters/SVGFEDiffuseLighting.h
@@ -22,7 +22,7 @@
#ifndef SVGFEDiffuseLighting_h
#define SVGFEDiffuseLighting_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "Color.h"
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -74,6 +74,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEDiffuseLighting_h
diff --git a/WebCore/svg/graphics/filters/SVGFEDisplacementMap.cpp b/WebCore/svg/graphics/filters/SVGFEDisplacementMap.cpp
index bfe7847..fda3a58 100644
--- a/WebCore/svg/graphics/filters/SVGFEDisplacementMap.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEDisplacementMap.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEDisplacementMap.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -114,4 +114,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEDisplacementMap.h b/WebCore/svg/graphics/filters/SVGFEDisplacementMap.h
index 82a14bc..7a4267b 100644
--- a/WebCore/svg/graphics/filters/SVGFEDisplacementMap.h
+++ b/WebCore/svg/graphics/filters/SVGFEDisplacementMap.h
@@ -22,7 +22,7 @@
#ifndef SVGFEDisplacementMap_h
#define SVGFEDisplacementMap_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "PlatformString.h"
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -68,6 +68,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEDisplacementMap_h
diff --git a/WebCore/svg/graphics/filters/SVGFEFlood.cpp b/WebCore/svg/graphics/filters/SVGFEFlood.cpp
index 1c82784..1b7f7be 100644
--- a/WebCore/svg/graphics/filters/SVGFEFlood.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEFlood.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEFlood.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -79,4 +79,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEFlood.h b/WebCore/svg/graphics/filters/SVGFEFlood.h
index 869dee3..26a1ee3 100644
--- a/WebCore/svg/graphics/filters/SVGFEFlood.h
+++ b/WebCore/svg/graphics/filters/SVGFEFlood.h
@@ -22,7 +22,7 @@
#ifndef SVGFEFlood_h
#define SVGFEFlood_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "Color.h"
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -52,6 +52,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEFlood_h
diff --git a/WebCore/svg/graphics/filters/SVGFEGaussianBlur.cpp b/WebCore/svg/graphics/filters/SVGFEGaussianBlur.cpp
index 39b66ed..dfe7188 100644
--- a/WebCore/svg/graphics/filters/SVGFEGaussianBlur.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEGaussianBlur.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEGaussianBlur.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -79,4 +79,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEGaussianBlur.h b/WebCore/svg/graphics/filters/SVGFEGaussianBlur.h
index c4476e0..c8160bc 100644
--- a/WebCore/svg/graphics/filters/SVGFEGaussianBlur.h
+++ b/WebCore/svg/graphics/filters/SVGFEGaussianBlur.h
@@ -22,7 +22,7 @@
#ifndef SVGFEGaussianBlur_h
#define SVGFEGaussianBlur_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -52,6 +52,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEGaussianBlur_h
diff --git a/WebCore/svg/graphics/filters/SVGFEImage.cpp b/WebCore/svg/graphics/filters/SVGFEImage.cpp
index 5a74f01..a04b875 100644
--- a/WebCore/svg/graphics/filters/SVGFEImage.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEImage.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEImage.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -82,4 +82,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEImage.h b/WebCore/svg/graphics/filters/SVGFEImage.h
index 6410b0d..815068b 100644
--- a/WebCore/svg/graphics/filters/SVGFEImage.h
+++ b/WebCore/svg/graphics/filters/SVGFEImage.h
@@ -22,7 +22,7 @@
#ifndef SVGFEImage_h
#define SVGFEImage_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "CachedImage.h"
#include "CachedResourceClient.h"
#include "CachedResourceHandle.h"
@@ -54,6 +54,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEImage_h
diff --git a/WebCore/svg/graphics/filters/SVGFEMerge.cpp b/WebCore/svg/graphics/filters/SVGFEMerge.cpp
index 7940636..94363be 100644
--- a/WebCore/svg/graphics/filters/SVGFEMerge.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEMerge.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEMerge.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -76,4 +76,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEMerge.h b/WebCore/svg/graphics/filters/SVGFEMerge.h
index 5b1dd74..76ec733 100644
--- a/WebCore/svg/graphics/filters/SVGFEMerge.h
+++ b/WebCore/svg/graphics/filters/SVGFEMerge.h
@@ -22,7 +22,7 @@
#ifndef SVGFEMerge_h
#define SVGFEMerge_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
#include <wtf/Vector.h>
@@ -48,6 +48,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEMerge_h
diff --git a/WebCore/svg/graphics/filters/SVGFEMorphology.cpp b/WebCore/svg/graphics/filters/SVGFEMorphology.cpp
index e18b9b0..294e86e 100644
--- a/WebCore/svg/graphics/filters/SVGFEMorphology.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEMorphology.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEMorphology.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -105,4 +105,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEMorphology.h b/WebCore/svg/graphics/filters/SVGFEMorphology.h
index 9cbde96..2ed9067 100644
--- a/WebCore/svg/graphics/filters/SVGFEMorphology.h
+++ b/WebCore/svg/graphics/filters/SVGFEMorphology.h
@@ -22,7 +22,7 @@
#ifndef SVGFEMorphology_h
#define SVGFEMorphology_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -61,6 +61,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEMorphology_h
diff --git a/WebCore/svg/graphics/filters/SVGFEOffset.cpp b/WebCore/svg/graphics/filters/SVGFEOffset.cpp
index 2b5e69d..140af3c 100644
--- a/WebCore/svg/graphics/filters/SVGFEOffset.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEOffset.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEOffset.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -79,4 +79,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFEOffset.h b/WebCore/svg/graphics/filters/SVGFEOffset.h
index d317094..f995d42 100644
--- a/WebCore/svg/graphics/filters/SVGFEOffset.h
+++ b/WebCore/svg/graphics/filters/SVGFEOffset.h
@@ -22,7 +22,7 @@
#ifndef SVGFEOffset_h
#define SVGFEOffset_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -52,6 +52,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFEOffset_h
diff --git a/WebCore/svg/graphics/filters/SVGFESpecularLighting.cpp b/WebCore/svg/graphics/filters/SVGFESpecularLighting.cpp
index b857e4e..8a5beec 100644
--- a/WebCore/svg/graphics/filters/SVGFESpecularLighting.cpp
+++ b/WebCore/svg/graphics/filters/SVGFESpecularLighting.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFESpecularLighting.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -145,4 +145,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFESpecularLighting.h b/WebCore/svg/graphics/filters/SVGFESpecularLighting.h
index 10362ac..dcc8dab 100644
--- a/WebCore/svg/graphics/filters/SVGFESpecularLighting.h
+++ b/WebCore/svg/graphics/filters/SVGFESpecularLighting.h
@@ -22,7 +22,7 @@
#ifndef SVGFESpecularLighting_h
#define SVGFESpecularLighting_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "Color.h"
#include "FilterEffect.h"
#include "SVGLightSource.h"
@@ -77,6 +77,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFESpecularLighting_h
diff --git a/WebCore/svg/graphics/filters/SVGFETile.cpp b/WebCore/svg/graphics/filters/SVGFETile.cpp
index 2e0d551..7f0a8fa 100644
--- a/WebCore/svg/graphics/filters/SVGFETile.cpp
+++ b/WebCore/svg/graphics/filters/SVGFETile.cpp
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFETile.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -54,5 +54,5 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFETile.h b/WebCore/svg/graphics/filters/SVGFETile.h
index 5d24274..cf31e03 100644
--- a/WebCore/svg/graphics/filters/SVGFETile.h
+++ b/WebCore/svg/graphics/filters/SVGFETile.h
@@ -22,7 +22,7 @@
#ifndef SVGFETile_h
#define SVGFETile_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -44,6 +44,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFETile_h
diff --git a/WebCore/svg/graphics/filters/SVGFETurbulence.cpp b/WebCore/svg/graphics/filters/SVGFETurbulence.cpp
index db26f38..243de05 100644
--- a/WebCore/svg/graphics/filters/SVGFETurbulence.cpp
+++ b/WebCore/svg/graphics/filters/SVGFETurbulence.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFETurbulence.h"
#include "SVGRenderTreeAsText.h"
#include "SVGResourceFilter.h"
@@ -143,4 +143,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFETurbulence.h b/WebCore/svg/graphics/filters/SVGFETurbulence.h
index 33e2853..c902c30 100644
--- a/WebCore/svg/graphics/filters/SVGFETurbulence.h
+++ b/WebCore/svg/graphics/filters/SVGFETurbulence.h
@@ -22,7 +22,7 @@
#ifndef SVGFETurbulence_h
#define SVGFETurbulence_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FilterEffect.h"
#include "SVGResourceFilter.h"
@@ -75,6 +75,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFETurbulence_h
diff --git a/WebCore/svg/graphics/filters/SVGFilterEffect.cpp b/WebCore/svg/graphics/filters/SVGFilterEffect.cpp
index f8e246f..cc7bacf 100644
--- a/WebCore/svg/graphics/filters/SVGFilterEffect.cpp
+++ b/WebCore/svg/graphics/filters/SVGFilterEffect.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterEffect.h"
#include "SVGRenderTreeAsText.h"
@@ -130,4 +130,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGFilterEffect.h b/WebCore/svg/graphics/filters/SVGFilterEffect.h
index d497f8b..ff3a31e 100644
--- a/WebCore/svg/graphics/filters/SVGFilterEffect.h
+++ b/WebCore/svg/graphics/filters/SVGFilterEffect.h
@@ -22,7 +22,7 @@
#ifndef SVGFilterEffect_h
#define SVGFilterEffect_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FloatRect.h"
#include "PlatformString.h"
@@ -94,6 +94,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGFilterEffect_h
diff --git a/WebCore/svg/graphics/filters/SVGLightSource.cpp b/WebCore/svg/graphics/filters/SVGLightSource.cpp
index 77611ca..9176b4c 100644
--- a/WebCore/svg/graphics/filters/SVGLightSource.cpp
+++ b/WebCore/svg/graphics/filters/SVGLightSource.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGPointLightSource.h"
#include "SVGRenderTreeAsText.h"
#include "SVGSpotLightSource.h"
@@ -62,4 +62,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/SVGLightSource.h b/WebCore/svg/graphics/filters/SVGLightSource.h
index 779e147..22b43c8 100644
--- a/WebCore/svg/graphics/filters/SVGLightSource.h
+++ b/WebCore/svg/graphics/filters/SVGLightSource.h
@@ -23,7 +23,7 @@
#ifndef SVGLightSource_h
#define SVGLightSource_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include <wtf/RefCounted.h>
namespace WebCore {
@@ -53,6 +53,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGLightSource_h
diff --git a/WebCore/svg/graphics/filters/SVGPointLightSource.h b/WebCore/svg/graphics/filters/SVGPointLightSource.h
index 099a165..772e278 100644
--- a/WebCore/svg/graphics/filters/SVGPointLightSource.h
+++ b/WebCore/svg/graphics/filters/SVGPointLightSource.h
@@ -23,7 +23,7 @@
#ifndef SVGPointLightSource_h
#define SVGPointLightSource_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FloatPoint3D.h"
#include "SVGLightSource.h"
@@ -46,6 +46,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGPointLightSource_h
diff --git a/WebCore/svg/graphics/filters/SVGSpotLightSource.h b/WebCore/svg/graphics/filters/SVGSpotLightSource.h
index a4aa1fb..9a787fb 100644
--- a/WebCore/svg/graphics/filters/SVGSpotLightSource.h
+++ b/WebCore/svg/graphics/filters/SVGSpotLightSource.h
@@ -23,7 +23,7 @@
#ifndef SVGSpotLightSource_h
#define SVGSpotLightSource_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "FloatPoint3D.h"
#include "SVGLightSource.h"
@@ -57,6 +57,6 @@
} // namespace WebCore
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGSpotLightSource_h
diff --git a/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.h b/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.h
index f35e028..8d6edf8 100644
--- a/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.h
+++ b/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.h
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "BlockExceptions.h"
#include "SVGFEDisplacementMap.h"
@@ -85,4 +85,4 @@
FE_QUARTZ_MAP_TO_SUBREGION_PREPARE(bbox); \
FE_QUARTZ_MAP_TO_SUBREGION_APPLY(cropRect);
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.mm b/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.mm
index 399d4c1..974a246 100644
--- a/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.mm
+++ b/WebCore/svg/graphics/filters/cg/SVGFEHelpersCg.mm
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEHelpersCg.h"
#include "Color.h"
@@ -159,4 +159,4 @@
}
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/SVGFilterEffectCg.mm b/WebCore/svg/graphics/filters/cg/SVGFilterEffectCg.mm
index 4b0a233..4f598a1 100644
--- a/WebCore/svg/graphics/filters/cg/SVGFilterEffectCg.mm
+++ b/WebCore/svg/graphics/filters/cg/SVGFilterEffectCg.mm
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterEffect.h"
@@ -34,4 +34,4 @@
}
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.h b/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.h
index 4693853..62c9d78 100644
--- a/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKArithmeticFilter : CIFilter {
CIImage *inputImage;
@@ -38,4 +38,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.m b/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.m
index 389f25d..9db36ef 100644
--- a/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKArithmeticFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKArithmeticFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *arithmeticFilter = nil;
@@ -91,4 +91,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.h b/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.h
index 778e326..690505a 100644
--- a/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKComponentMergeFilter : CIFilter {
CIImage *inputFuncR;
@@ -36,4 +36,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.m b/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.m
index 4f2045a..2853d77 100644
--- a/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKComponentMergeFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKComponentMergeFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *componentMergeFilter = nil;
@@ -67,4 +67,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.h b/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.h
index 2731986..7624c7d 100644
--- a/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKDiffuseLightingFilter : CIFilter {
CISampler *inputNormalMap;
@@ -38,4 +38,4 @@
}
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.m b/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.m
index 3675af8..37e4f45 100644
--- a/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKDiffuseLightingFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKDiffuseLightingFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *diffuseLightingFilter = nil;
@implementation WKDiffuseLightingFilter
@@ -94,4 +94,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.h b/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.h
index d444c75..6cf2417 100644
--- a/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKDiscreteTransferFilter : CIFilter {
CIImage *inputImage;
@@ -35,4 +35,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.m b/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.m
index dc6ca76..df77418 100644
--- a/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKDiscreteTransferFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKDiscreteTransferFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *discreteTransferFilter = nil;
@@ -70,4 +70,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.h b/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.h
index e594495..e8f2c05 100644
--- a/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKDisplacementMapFilter : CIFilter {
CIImage *inputImage;
@@ -37,4 +37,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.m b/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.m
index 8ccd52c..24029c5 100644
--- a/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKDisplacementMapFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKDisplacementMapFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *displacementMapFilter = nil;
@@ -78,4 +78,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.h b/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.h
index e5fe15a..f0b1d69 100644
--- a/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKDistantLightFilter : CIFilter {
CIImage * inputNormalMap;
@@ -33,4 +33,4 @@
}
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.m b/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.m
index 29e3caf..3e390e8 100644
--- a/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKDistantLightFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKDistantLightFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *distantLightFilter = nil;
@@ -70,4 +70,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.h b/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.h
index 7e0c1e4..0844899 100644
--- a/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKGammaTransferFilter : CIFilter {
CIImage *inputImage;
@@ -36,4 +36,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.m b/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.m
index 8642931..6a59cc5 100644
--- a/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKGammaTransferFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKGammaTransferFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *gammaTransferFilter = nil;
@@ -82,4 +82,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.h b/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.h
index 0c36daa..0493ce1 100644
--- a/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKIdentityTransferFilter : CIFilter {
CIImage *inputImage;
@@ -33,4 +33,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.m b/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.m
index 935c305..70a53ed 100644
--- a/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKIdentityTransferFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKIdentityTransferFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@implementation WKIdentityTransferFilter
+ (void)initialize
@@ -57,4 +57,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.h b/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.h
index 91a99f5..a0b9e1e 100644
--- a/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKLinearTransferFilter : CIFilter {
CIImage *inputImage;
@@ -35,4 +35,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.m b/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.m
index 6582f9f..288fe05 100644
--- a/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKLinearTransferFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKLinearTransferFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *linearTransferFilter = nil;
@@ -77,4 +77,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.h b/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.h
index fb27447..e577278 100644
--- a/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKNormalMapFilter : CIFilter {
CIImage *inputImage;
@@ -33,4 +33,4 @@
}
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.m b/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.m
index b462008..b95f07a 100644
--- a/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKNormalMapFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKNormalMapFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *convolveKernel = nil;
static CIKernel *normalMapKernel = nil;
@@ -106,4 +106,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKPointLightFilter.h b/WebCore/svg/graphics/filters/cg/WKPointLightFilter.h
index 58ec689..59ca449 100644
--- a/WebCore/svg/graphics/filters/cg/WKPointLightFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKPointLightFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKPointLightFilter : CIFilter {
CIImage *inputNormalMap;
@@ -35,4 +35,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKPointLightFilter.m b/WebCore/svg/graphics/filters/cg/WKPointLightFilter.m
index 331207e..c3503c8 100644
--- a/WebCore/svg/graphics/filters/cg/WKPointLightFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKPointLightFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKPointLightFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *pointLightFilter = nil;
@@ -70,4 +70,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.h b/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.h
index cce9e06..4316822 100644
--- a/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKSpecularLightingFilter : CIFilter {
CISampler *inputNormalMap;
@@ -39,4 +39,4 @@
}
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.m b/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.m
index 22495ae..34d99d5 100644
--- a/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKSpecularLightingFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKSpecularLightingFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *specularLightingFilter = nil;
@@ -93,4 +93,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.h b/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.h
index d87beca..c013495 100644
--- a/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKSpotLightFilter : CIFilter {
CIImage *inputLightVectors;
@@ -35,4 +35,4 @@
}
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.m b/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.m
index 62973ef..ed94564 100644
--- a/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKSpotLightFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKSpotLightFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *spotLightFilter = nil;
@@ -81,4 +81,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.h b/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.h
index 34adf00..34cac83 100644
--- a/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.h
+++ b/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.h
@@ -25,7 +25,7 @@
#import <QuartzCore/CoreImage.h>
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
@interface WKTableTransferFilter : CIFilter {
CIImage *inputImage;
diff --git a/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.m b/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.m
index 55d7c9d..6189526 100644
--- a/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.m
+++ b/WebCore/svg/graphics/filters/cg/WKTableTransferFilter.m
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKTableTransferFilter.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
static CIKernel *tableTransferFilter = nil;
@@ -73,4 +73,4 @@
@end
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.h b/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.h
index 54f8237..ee3bb72 100644
--- a/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.h
+++ b/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.h
@@ -26,7 +26,7 @@
#ifndef SVGResourceFilterPlatformDataMac_h
#define SVGResourceFilterPlatformDataMac_h
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGResourceFilter.h"
@@ -60,6 +60,6 @@
};
}
-#endif // #if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // #if ENABLE(SVG) && ENABLE(FILTERS)
#endif // SVGResourceFilterPlatformDataMac_h
diff --git a/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.mm b/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.mm
index 225c649..5ba8165 100644
--- a/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.mm
+++ b/WebCore/svg/graphics/mac/SVGResourceFilterPlatformDataMac.mm
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGResourceFilterPlatformDataMac.h"
#include <QuartzCore/CoreImage.h>
@@ -125,4 +125,4 @@
}
-#endif // #if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // #if ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/graphics/qt/SVGResourceFilterQt.cpp b/WebCore/svg/graphics/qt/SVGResourceFilterQt.cpp
index cbf90cd..3602ffa 100644
--- a/WebCore/svg/graphics/qt/SVGResourceFilterQt.cpp
+++ b/WebCore/svg/graphics/qt/SVGResourceFilterQt.cpp
@@ -21,7 +21,7 @@
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGResourceFilter.h"
#include "NotImplemented.h"
diff --git a/WebCore/svg/graphics/skia/SVGResourceFilterSkia.cpp b/WebCore/svg/graphics/skia/SVGResourceFilterSkia.cpp
index b54eb4b..bd7fcf3 100644
--- a/WebCore/svg/graphics/skia/SVGResourceFilterSkia.cpp
+++ b/WebCore/svg/graphics/skia/SVGResourceFilterSkia.cpp
@@ -29,7 +29,7 @@
*/
#include "config.h"
-#if ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
#include "NotImplemented.h"
#include "SVGResourceFilter.h"
@@ -52,4 +52,4 @@
}
-#endif // ENABLE(SVG) && ENABLE(SVG_FILTERS)
+#endif // ENABLE(SVG) && ENABLE(FILTERS)
diff --git a/WebCore/svg/svgtags.in b/WebCore/svg/svgtags.in
index fe19f3d..6ac430d 100644
--- a/WebCore/svg/svgtags.in
+++ b/WebCore/svg/svgtags.in
@@ -30,7 +30,7 @@
defs
desc
ellipse
-#if ENABLE_SVG_FILTERS
+#if ENABLE_FILTERS
feBlend
feColorMatrix
feComponentTransfer
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index cafcbf4..448f5b2 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-28 Dirk Schulze <krit@webkit.org>
+
+ Reviewed by Nikolas Zimmermann.
+
+ Added new build flag --filters. More details in WebCore/ChangeLog.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2009-05-27 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Darin Adler.
diff --git a/WebKit/mac/Configurations/FeatureDefines.xcconfig b/WebKit/mac/Configurations/FeatureDefines.xcconfig
index c9a5265..95fb0c6 100644
--- a/WebKit/mac/Configurations/FeatureDefines.xcconfig
+++ b/WebKit/mac/Configurations/FeatureDefines.xcconfig
@@ -31,6 +31,7 @@
ENABLE_CHANNEL_MESSAGING = ;
ENABLE_DATABASE = ENABLE_DATABASE;
ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
+ENABLE_FILTERS = ;
ENABLE_GEOLOCATION = ;
ENABLE_ICONDATABASE = ENABLE_ICONDATABASE;
ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
@@ -48,4 +49,4 @@
ENABLE_XPATH = ENABLE_XPATH;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_DATABASE) $(ENABLE_DOM_STORAGE) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_DATABASE) $(ENABLE_DOM_STORAGE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ddfa6e3..424842b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-28 Dirk Schulze <krit@webkit.org>
+
+ Reviewed by Nikolas Zimmermann.
+
+ Added new build flag --filters. More details in WebCore/ChangeLog.
+
+ * Scripts/build-webkit:
+
2009-05-28 Olivier DOLE <odole@pleyo.com>
Reviewed by Maciej.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 739c9fc..b890002 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -55,7 +55,7 @@
my $svgAnimationSupport = 1;
my $svgAsImageSupport = 1;
my $svgDOMObjCBindingsSupport = isAppleMacWebKit();
-my $svgFiltersSupport = 0;
+my $filtersSupport = 0;
my $svgFontsSupport = 1;
my $svgForeignObjectSupport = 1;
my $svgUseSupport = 1;
@@ -83,6 +83,7 @@
--[no-]channel-messaging Toggle MessageChannel and MessagePort support (default: $channelMessagingSupport)
--[no-]database Toggle Database Support (default: $databaseSupport)
--[no-]dom-storage Toggle DOM Storage Support (default: $domStorageSupport)
+ --[no-]filters Toggle Filters support (default: $filtersSupport)
--[no-]geolocation Toggle Geolocation support (default: $geolocationSupport)
--[no-]gnomekeyring Toggle GNOME Keyring Support (GTK+ port only) (default: $gnomeKeyringSupport)
--[no-]icon-database Toggle Icon database support (default: $iconDatabaseSupport)
@@ -92,7 +93,6 @@
--[no-]svg-animation Toggle SVG animation support (default: $svgAnimationSupport, implies SVG Support)
--[no-]svg-as-image Toggle SVG as Image support (default: $svgAsImageSupport, implies SVG Support)
--[no-]svg-dom-objc-bindings Toggle SVG DOM Objective-C bindings support (default: $svgDOMObjCBindingsSupport, implies SVG Support)
- --[no-]svg-filters Toggle SVG filters support (default: $svgFiltersSupport, implies SVG Support)
--[no-]svg-fonts Toggle SVG fonts support (default: $svgFontsSupport, implies SVG Support)
--[no-]svg-foreign-object Toggle SVG foreign object support (default: $svgForeignObjectSupport, implies SVG Support)
--[no-]svg-use Toggle SVG use element support (default: $svgUseSupport, implies SVG Support)
@@ -111,6 +111,7 @@
'channel-messaging!' => \$channelMessagingSupport,
'database!' => \$databaseSupport,
'dom-storage!' => \$domStorageSupport,
+ 'filters!' => \$filtersSupport,
'geolocation!' => \$geolocationSupport,
'gnomekeyring!' => \$gnomeKeyringSupport,
'icon-database!' => \$iconDatabaseSupport,
@@ -120,7 +121,6 @@
'svg-animation!' => \$svgAnimationSupport,
'svg-as-image!' => \$svgAsImageSupport,
'svg-dom-objc-bindings!' => \$svgDOMObjCBindingsSupport,
- 'svg-filters!' => \$svgFiltersSupport,
'svg-fonts!' => \$svgFontsSupport,
'svg-foreign-object!' => \$svgForeignObjectSupport,
'svg-use!' => \$svgUseSupport,
@@ -133,7 +133,7 @@
);
$svgSupport = $svgSupport || $svgAnimationSupport || $svgAsImageSupport
- || $svgDOMObjCBindingsSupport || $svgFiltersSupport || $svgFontsSupport
+ || $svgDOMObjCBindingsSupport || $svgFontsSupport
|| $svgForeignObjectSupport || $svgUseSupport;
if ($showHelp) {
@@ -180,6 +180,7 @@
push @options, autotoolsFlag($channelMessagingSupport, "channel-messaging");
push @options, autotoolsFlag($databaseSupport, "database");
push @options, autotoolsFlag($domStorageSupport, "dom-storage");
+ push @options, autotoolsFlag($filtersSupport, "filters");
push @options, autotoolsFlag($geolocationSupport, "geolocation");
push @options, autotoolsFlag($gnomeKeyringSupport, "gnomekeyring");
push @options, autotoolsFlag($iconDatabaseSupport, "icon-database");
@@ -188,7 +189,6 @@
push @options, autotoolsFlag($svgSupport, "svg");
push @options, autotoolsFlag($svgAnimationSupport, "svg-animation");
push @options, autotoolsFlag($svgAsImageSupport, "svg-as-image");
- push @options, autotoolsFlag($svgFiltersSupport, "svg-filters");
push @options, autotoolsFlag($svgFontsSupport, "svg-fonts");
push @options, autotoolsFlag($svgForeignObjectSupport, "svg-foreign-object");
push @options, autotoolsFlag($svgUseSupport, "svg-use-element");
@@ -213,6 +213,7 @@
push @options, option("ENABLE_CHANNEL_MESSAGING", $channelMessagingSupport);
push @options, option("ENABLE_DATABASE", $databaseSupport);
push @options, option("ENABLE_DOM_STORAGE", $domStorageSupport);
+ push @options, option("ENABLE_FILTERS", $filtersSupport);
push @options, option("ENABLE_GEOLOCATION", $geolocationSupport);
push @options, option("ENABLE_ICONDATABASE", $iconDatabaseSupport);
push @options, option("ENABLE_JAVASCRIPT_DEBUGGER", $javaScriptDebuggerSupport);
@@ -221,7 +222,6 @@
push @options, option("ENABLE_SVG_ANIMATION", $svgAnimationSupport);
push @options, option("ENABLE_SVG_AS_IMAGE", $svgAsImageSupport);
push @options, option("ENABLE_SVG_DOM_OBJC_BINDINGS", $svgDOMObjCBindingsSupport);
- push @options, option("ENABLE_SVG_FILTERS", $svgFiltersSupport);
push @options, option("ENABLE_SVG_FONTS", $svgFontsSupport);
push @options, option("ENABLE_SVG_FOREIGN_OBJECT", $svgForeignObjectSupport);
push @options, option("ENABLE_SVG_USE", $svgUseSupport);
@@ -347,12 +347,11 @@
print "\n NOTE: WebKit has been built with SVG support enabled.\n";
print " $launcherName will have SVG viewing capabilities.\n";
}
-if ($svgAnimationSupport or $svgAsImageSupport or $svgDOMObjCBindingsSupport or $svgFiltersSupport or $svgFontsSupport or $svgForeignObjectSupport or $svgUseSupport) {
+if ($svgAnimationSupport or $svgAsImageSupport or $svgDOMObjCBindingsSupport or $svgFontsSupport or $svgForeignObjectSupport or $svgUseSupport) {
print " Your build supports the following (optional) SVG features: \n";
print " * Basic SVG animation.\n" if $svgAnimationSupport;
print " * SVG as image.\n" if $svgAsImageSupport;
print " * SVG DOM Objective-C bindings.\n" if $svgDOMObjCBindingsSupport;
- print " * SVG filters.\n" if $svgFiltersSupport;
print " * SVG fonts.\n" if $svgFontsSupport;
print " * SVG foreign object.\n" if $svgForeignObjectSupport;
print " * SVG <use> support.\n" if $svgUseSupport;
diff --git a/configure.ac b/configure.ac
index 9882a72..2ee8210 100644
--- a/configure.ac
+++ b/configure.ac
@@ -404,7 +404,6 @@
# turn off svg features if --disable-svg is requested
if test "$enable_svg" = "no"; then
enable_svg_animation=no
- enable_svg_filters=no
enable_svg_fonts=no
enable_svg_foreign_object=no
enable_svg_as_image=no
@@ -419,13 +418,13 @@
[],[enable_svg_animation="yes"])
AC_MSG_RESULT([$enable_svg_animation])
-# check whether to enable support for SVG filters
-AC_MSG_CHECKING([whether to enable support for SVG filters])
-AC_ARG_ENABLE(svg_filters,
- AC_HELP_STRING([--enable-svg-filters],
- [enable support for SVG filters (experimental) [default=no]]),
- [],[enable_svg_filters="no"])
-AC_MSG_RESULT([$enable_svg_filters])
+# check whether to enable support for filters
+AC_MSG_CHECKING([whether to enable support for filters])
+AC_ARG_ENABLE(filters,
+ AC_HELP_STRING([--enable-filters],
+ [enable support for filters (experimental) [default=no]]),
+ [],[enable_filters="no"])
+AC_MSG_RESULT([$enable_filters])
# check whether to enable support for SVG fonts
AC_MSG_CHECKING([whether to enable support for SVG fonts])
@@ -461,7 +460,6 @@
# check for SVG features, enabling SVG if necessary
if test "$enable_svg_animation" = "yes" || \
- test "$enable_svg_filters" = "yes" || \
test "$enable_svg_fonts" = "yes" || \
test "$enable_svg_foreign_object" = "yes" || \
test "$enable_svg_as_image" = "yes" || \
@@ -664,11 +662,11 @@
AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
+AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"])
-AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"])
AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"])
AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
@@ -705,6 +703,7 @@
3D Transforms : $enable_3D_transforms
JIT compilation : $enable_jit
Dashboard support : $enable_dashboard_support
+ Filters support : $enable_filters
Geolocation support : $enable_geolocation
GNOME Keyring support : $enable_gnomekeyring
JavaScript debugger/profiler support : $enable_javascript_debugger
@@ -716,7 +715,6 @@
Icon database support : $enable_icon_database
SVG support : $enable_svg
SVG animation support : $enable_svg_animation
- SVG filters support : $enable_svg_filters
SVG fonts support : $enable_svg_fonts
SVG foreign object support : $enable_svg_foreign_object
SVG as image support : $enable_svg_as_image
