Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 48 insertions, 0 deletions

diff --git a/Source/WebCore/svg/SVGFEMergeNodeElement.h b/Source/WebCore/svg/SVGFEMergeNodeElement.h
new file mode 100644
index 0000000..14f0e8e
--- /dev/null
+++ b/Source/WebCore/svg/SVGFEMergeNodeElement.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
+ * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef SVGFEMergeNodeElement_h
+#define SVGFEMergeNodeElement_h
+
+#if ENABLE(SVG) && ENABLE(FILTERS)
+#include "SVGAnimatedString.h"
+#include "SVGElement.h"
+
+namespace WebCore {
+
+class SVGFEMergeNodeElement : public SVGElement {
+public:
+    static PassRefPtr<SVGFEMergeNodeElement> create(const QualifiedName&, Document*);
+
+private:
+    SVGFEMergeNodeElement(const QualifiedName&, Document*);
+
+    virtual void parseMappedAttribute(Attribute*);
+    virtual void svgAttributeChanged(const QualifiedName&);
+    virtual void synchronizeProperty(const QualifiedName&);
+
+    // Animated property declarations
+    DECLARE_ANIMATED_STRING(In1, in1)
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(SVG)
+#endif