Use WebBlendMode in FEBlend

Source/core/svg/SVGFEBlendElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 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.
  */
 
 #include "config.h"
 
 #include "core/svg/SVGFEBlendElement.h"
 
 #include "core/SVGNames.h"
+#include "platform/graphics/filters/FEBlend.h"
 #include "platform/graphics/filters/FilterEffect.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
 
 namespace blink {
 
-template<> const SVGEnumerationStringEntries& getStaticStringEntries<BlendModeType>()
+static WebBlendMode toWebBlendMode(SVGFEBlendElement::Mode mode)
+{
+    switch (mode) {
+    case SVGFEBlendElement::ModeNormal:
+        return WebBlendModeNormal;
+    case SVGFEBlendElement::ModeMultiply:
+        return WebBlendModeMultiply;
+    case SVGFEBlendElement::ModeScreen:
+        return WebBlendModeScreen;
+    case SVGFEBlendElement::ModeDarken:
+        return WebBlendModeDarken;
+    case SVGFEBlendElement::ModeLighten:
+        return WebBlendModeLighten;
+    default:
+        ASSERT_NOT_REACHED();
+        return WebBlendModeNormal;
+    }
+}
+
+template<> const SVGEnumerationStringEntries& getStaticStringEntries<SVGFEBlendElement::Mode>()
 {
     DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ());
     if (entries.isEmpty()) {
-        entries.append(std::make_pair(FEBLEND_MODE_NORMAL, "normal"));
-        entries.append(std::make_pair(FEBLEND_MODE_MULTIPLY, "multiply"));
-        entries.append(std::make_pair(FEBLEND_MODE_SCREEN, "screen"));
-        entries.append(std::make_pair(FEBLEND_MODE_DARKEN, "darken"));
-        entries.append(std::make_pair(FEBLEND_MODE_LIGHTEN, "lighten"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeNormal, "normal"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeMultiply, "multiply"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeScreen, "screen"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeDarken, "darken"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeLighten, "lighten"));
     }
     return entries;
 }
 
 inline SVGFEBlendElement::SVGFEBlendElement(Document& document)
     : SVGFilterPrimitiveStandardAttributes(SVGNames::feBlendTag, document)
     , m_in1(SVGAnimatedString::create(this, SVGNames::inAttr, SVGString::create()))
     , m_in2(SVGAnimatedString::create(this, SVGNames::in2Attr, SVGString::create()))
-    , m_mode(SVGAnimatedEnumeration<BlendModeType>::create(this, SVGNames::modeAttr, FEBLEND_MODE_NORMAL))
+    , m_mode(SVGAnimatedEnumeration<Mode>::create(this, SVGNames::modeAttr, SVGFEBlendElement::ModeNormal))
 {
     ScriptWrappable::init(this);
     addToPropertyMap(m_in1);
     addToPropertyMap(m_in2);
     addToPropertyMap(m_mode);
 }
 
 DEFINE_NODE_FACTORY(SVGFEBlendElement)
 
 bool SVGFEBlendElement::isSupportedAttribute(const QualifiedName& attrName)
@@ skipping 25 matching lines @@
     else
         ASSERT_NOT_REACHED();
 
     reportAttributeParsingError(parseError, name, value);
 }
 
 bool SVGFEBlendElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName)
 {
     FEBlend* blend = static_cast<FEBlend*>(effect);
     if (attrName == SVGNames::modeAttr)
-        return blend->setBlendMode(m_mode->currentValue()->enumValue());
+        return blend->setBlendMode(toWebBlendMode(m_mode->currentValue()->enumValue()));
 
     ASSERT_NOT_REACHED();
     return false;
 }
 
 void SVGFEBlendElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     if (!isSupportedAttribute(attrName)) {
         SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName);
         return;
@@ skipping 15 matching lines @@
 }
 
 PassRefPtr<FilterEffect> SVGFEBlendElement::build(SVGFilterBuilder* filterBuilder, Filter* filter)
 {
     FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->currentValue()->value()));
     FilterEffect* input2 = filterBuilder->getEffectById(AtomicString(m_in2->currentValue()->value()));
 
     if (!input1 || !input2)
         return nullptr;
 
-    RefPtr<FilterEffect> effect = FEBlend::create(filter, m_mode->currentValue()->enumValue());
+    RefPtr<FilterEffect> effect = FEBlend::create(filter, toWebBlendMode(m_mode->currentValue()->enumValue()));
     FilterEffectVector& inputEffects = effect->inputEffects();
     inputEffects.reserveCapacity(2);
     inputEffects.append(input1);
     inputEffects.append(input2);
     return effect.release();
 }
 
 }