Add support for additional blend modes to SVGFEBlendElement

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,
@@ skipping 13 matching lines @@
 
 #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 {
 
 static WebBlendMode toWebBlendMode(SVGFEBlendElement::Mode mode)
 {
+#define MAP_BLEND_MODE(MODENAME)            \
+    case SVGFEBlendElement::Mode##MODENAME: \
+        return WebBlendMode##MODENAME
+
     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;
+        MAP_BLEND_MODE(Normal);
+        MAP_BLEND_MODE(Multiply);
+        MAP_BLEND_MODE(Screen);
+        MAP_BLEND_MODE(Darken);
+        MAP_BLEND_MODE(Lighten);
+        MAP_BLEND_MODE(Overlay);
+        MAP_BLEND_MODE(ColorDodge);
+        MAP_BLEND_MODE(ColorBurn);
+        MAP_BLEND_MODE(HardLight);
+        MAP_BLEND_MODE(SoftLight);
+        MAP_BLEND_MODE(Difference);
+        MAP_BLEND_MODE(Exclusion);
+        MAP_BLEND_MODE(Hue);
+        MAP_BLEND_MODE(Saturation);
+        MAP_BLEND_MODE(Color);
+        MAP_BLEND_MODE(Luminosity);
     default:
         ASSERT_NOT_REACHED();
         return WebBlendModeNormal;
     }
+#undef MAP_BLEND_MODE
 }
 
 template<> const SVGEnumerationStringEntries& getStaticStringEntries<SVGFEBlendElement::Mode>()
 {
     DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ());
     if (entries.isEmpty()) {
         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"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeOverlay, "overlay"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeColorDodge, "color-dodge"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeColorBurn, "color-burn"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeHardLight, "hard-light"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeSoftLight, "soft-light"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeDifference, "difference"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeExclusion, "exclusion"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeHue, "hue"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeSaturation, "saturation"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeColor, "color"));
+        entries.append(std::make_pair(SVGFEBlendElement::ModeLuminosity, "luminosity"));
     }
     return entries;
 }
 
+template<> unsigned short getMaxExposedEnumValue<SVGFEBlendElement::Mode>()
+{
+    return SVGFEBlendElement::ModeLighten;
+}
+
 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<Mode>::create(this, SVGNames::modeAttr, SVGFEBlendElement::ModeNormal))
 {
     ScriptWrappable::init(this);
     addToPropertyMap(m_in1);
     addToPropertyMap(m_in2);
     addToPropertyMap(m_mode);
@@ skipping 75 matching lines @@
 
     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();
 }
 
 }