summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-15 09:06:43 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-15 09:31:31 (GMT)
commitc411f16870f112c3407c28c22b617f613a82cff4 (patch)
tree29a1bcd590c8b31af2aab445bfe8a978dc5bf582 /src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.h
parent3d77b56b32a0c53ec0bbfaa07236fedb900ff336 (diff)
downloadQt-c411f16870f112c3407c28c22b617f613a82cff4.zip
Qt-c411f16870f112c3407c28c22b617f613a82cff4.tar.gz
Qt-c411f16870f112c3407c28c22b617f613a82cff4.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-15062009 ( 65232bf00dc494ebfd978f998c88f58d18ecce1e )
Diffstat (limited to 'src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.h')
-rw-r--r--src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.h b/src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.h
index 89ad7df..fc97169 100644
--- a/src/3rdparty/webkit/WebCore/svg/SVGFECompositeElement.h
+++ b/src/3rdparty/webkit/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"
@@ -35,8 +35,7 @@ namespace WebCore {
virtual ~SVGFECompositeElement();
virtual void parseMappedAttribute(MappedAttribute*);
- virtual SVGFilterEffect* filterEffect(SVGResourceFilter*) const;
- bool build(FilterBuilder*);
+ virtual bool build(SVGResourceFilter*);
private:
ANIMATED_PROPERTY_DECLARATIONS(SVGFECompositeElement, SVGNames::feCompositeTagString, SVGNames::inAttrString, String, In1, in1)
@@ -46,8 +45,6 @@ namespace WebCore {
ANIMATED_PROPERTY_DECLARATIONS(SVGFECompositeElement, SVGNames::feCompositeTagString, SVGNames::k2AttrString, float, K2, k2)
ANIMATED_PROPERTY_DECLARATIONS(SVGFECompositeElement, SVGNames::feCompositeTagString, SVGNames::k3AttrString, float, K3, k3)
ANIMATED_PROPERTY_DECLARATIONS(SVGFECompositeElement, SVGNames::feCompositeTagString, SVGNames::k4AttrString, float, K4, k4)
-
- mutable RefPtr<FEComposite> m_filterEffect;
};
} // namespace WebCore