Get rid of special casing for 'operator' from the bindings generator

Source/core/svg/SVGFECompositeElement.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 14 matching lines @@
 #include "SVGNames.h"
 #include "core/platform/graphics/filters/FilterEffect.h"
 #include "core/svg/SVGElementInstance.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
 
 namespace WebCore {
 
 // Animated property definitions
 DEFINE_ANIMATED_STRING(SVGFECompositeElement, SVGNames::inAttr, In1, in1)
 DEFINE_ANIMATED_STRING(SVGFECompositeElement, SVGNames::in2Attr, In2, in2)
-DEFINE_ANIMATED_ENUMERATION(SVGFECompositeElement, SVGNames::operatorAttr, _operator, _operator, CompositeOperationType)
+DEFINE_ANIMATED_ENUMERATION(SVGFECompositeElement, SVGNames::operatorAttr, SVGOperator, svgOperator, CompositeOperationType)
 DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k1Attr, K1, k1)
 DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k2Attr, K2, k2)
 DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k3Attr, K3, k3)
 DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k4Attr, K4, k4)
 
 BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFECompositeElement)
     REGISTER_LOCAL_ANIMATED_PROPERTY(in1)
     REGISTER_LOCAL_ANIMATED_PROPERTY(in2)
-    REGISTER_LOCAL_ANIMATED_PROPERTY(_operator)
+    REGISTER_LOCAL_ANIMATED_PROPERTY(svgOperator)
     REGISTER_LOCAL_ANIMATED_PROPERTY(k1)
     REGISTER_LOCAL_ANIMATED_PROPERTY(k2)
     REGISTER_LOCAL_ANIMATED_PROPERTY(k3)
     REGISTER_LOCAL_ANIMATED_PROPERTY(k4)
     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGFilterPrimitiveStandardAttributes)
 END_REGISTER_ANIMATED_PROPERTIES
 
 inline SVGFECompositeElement::SVGFECompositeElement(const QualifiedName& tagName, Document* document)
     : SVGFilterPrimitiveStandardAttributes(tagName, document)
-    , m__operator(FECOMPOSITE_OPERATOR_OVER)
+    , m_svgOperator(FECOMPOSITE_OPERATOR_OVER)
 {
     ASSERT(hasTagName(SVGNames::feCompositeTag));
     ScriptWrappable::init(this);
     registerAnimatedPropertiesForSVGFECompositeElement();
 }
 
 PassRefPtr<SVGFECompositeElement> SVGFECompositeElement::create(const QualifiedName& tagName, Document* document)
 {
     return adoptRef(new SVGFECompositeElement(tagName, document));
 }
@@ skipping 16 matching lines @@
 void SVGFECompositeElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     if (!isSupportedAttribute(name)) {
         SVGFilterPrimitiveStandardAttributes::parseAttribute(name, value);
         return;
     }
 
     if (name == SVGNames::operatorAttr) {
         CompositeOperationType propertyValue = SVGPropertyTraits<CompositeOperationType>::fromString(value);
         if (propertyValue > 0)
-            set_operatorBaseValue(propertyValue);
+            setSVGOperatorBaseValue(propertyValue);
         return;
     }
 
     if (name == SVGNames::inAttr) {
         setIn1BaseValue(value);
         return;
     }
 
     if (name == SVGNames::in2Attr) {
         setIn2BaseValue(value);
@@ skipping 20 matching lines @@
         return;
     }
 
     ASSERT_NOT_REACHED();
 }
 
 bool SVGFECompositeElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName)
 {
     FEComposite* composite = static_cast<FEComposite*>(effect);
     if (attrName == SVGNames::operatorAttr)
-        return composite->setOperation(_operatorCurrentValue());
+        return composite->setOperation(svgOperatorCurrentValue());
     if (attrName == SVGNames::k1Attr)
         return composite->setK1(k1CurrentValue());
     if (attrName == SVGNames::k2Attr)
         return composite->setK2(k2CurrentValue());
     if (attrName == SVGNames::k3Attr)
         return composite->setK3(k3CurrentValue());
     if (attrName == SVGNames::k4Attr)
         return composite->setK4(k4CurrentValue());
 
     ASSERT_NOT_REACHED();
@@ skipping 28 matching lines @@
 }
 
 PassRefPtr<FilterEffect> SVGFECompositeElement::build(SVGFilterBuilder* filterBuilder, Filter* filter)
 {
     FilterEffect* input1 = filterBuilder->getEffectById(in1CurrentValue());
     FilterEffect* input2 = filterBuilder->getEffectById(in2CurrentValue());
     
     if (!input1 || !input2)
         return 0;
 
-    RefPtr<FilterEffect> effect = FEComposite::create(filter, _operatorCurrentValue(), k1CurrentValue(), k2CurrentValue(), k3CurrentValue(), k4CurrentValue());
+    RefPtr<FilterEffect> effect = FEComposite::create(filter, svgOperatorCurrentValue(), k1CurrentValue(), k2CurrentValue(), k3CurrentValue(), k4CurrentValue());
     FilterEffectVector& inputEffects = effect->inputEffects();
     inputEffects.reserveCapacity(2);
     inputEffects.append(input1);
     inputEffects.append(input2);    
     return effect.release();
 }
 
 }