Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 19 insertions, 0 deletions

diff --git a/Source/WebCore/svg/SVGFEFloodElement.cpp b/Source/WebCore/svg/SVGFEFloodElement.cpp
index eb20927..bb676a9 100644
--- a/Source/WebCore/svg/SVGFEFloodElement.cpp
+++ b/Source/WebCore/svg/SVGFEFloodElement.cpp
@@ -25,6 +25,7 @@
 
 #include "Attribute.h"
 #include "RenderStyle.h"
+#include "SVGNames.h"
 #include "SVGRenderStyle.h"
 
 namespace WebCore {
@@ -39,6 +40,24 @@ PassRefPtr<SVGFEFloodElement> SVGFEFloodElement::create(const QualifiedName& tag
     return adoptRef(new SVGFEFloodElement(tagName, document));
 }
 
+
+bool SVGFEFloodElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName)
+{
+    RenderObject* renderer = this->renderer();
+    ASSERT(renderer);
+    RenderStyle* style = renderer->style();
+    ASSERT(style);
+    FEFlood* flood = static_cast<FEFlood*>(effect);
+
+    if (attrName == SVGNames::flood_colorAttr)
+        return flood->setFloodColor(style->svgStyle()->floodColor());
+    if (attrName == SVGNames::flood_opacityAttr)
+        return flood->setFloodOpacity(style->svgStyle()->floodOpacity());
+
+    ASSERT_NOT_REACHED();
+    return false;
+}
+
 PassRefPtr<FilterEffect> SVGFEFloodElement::build(SVGFilterBuilder*, Filter* filter)
 {
     RefPtr<RenderStyle> filterStyle = styleForRenderer();