ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h

Index: third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h
diff --git a/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h b/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h
index 35e6ac143ef701aef9e8ac196c355739d2346106..ec442d030d02df1ea3fc75fdbe16f9cee66effe6 100644
--- a/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h
+++ b/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h
@@ -196,11 +196,15 @@ class SVGAnimatedProperty : public SVGAnimatedPropertyCommon<Property> {
     m_baseValueUpdated = true;
 
     ASSERT(this->attributeName() != QualifiedName::null());
-    this->contextElement()->invalidateSVGAttributes();
-    this->contextElement()->svgAttributeBaseValChanged(this->attributeName());
+    /* DO NOT SUBMIT - Merge conflict marker */
+    /* Please spell |contextElement| (not |ContextElement|) below. */
+    this->contextElement()->InvalidateSVGAttributes();
+    this->contextElement()->SvgAttributeBaseValChanged(this->AttributeName());
   }
 
   PrimitiveType animVal() {
+    /* DO NOT SUBMIT - Merge conflict marker */
+    /* Please spell |contextElement| (not |ContextElement|) below. */
     this->contextElement()->ensureAttributeAnimValUpdated();
     return this->currentValue()->value();
   }
@@ -260,6 +264,8 @@ class SVGAnimatedProperty<Property, TearOffType, void>
   virtual TearOffType* baseVal() {
     if (!m_baseValTearOff) {
       m_baseValTearOff =
+          /* DO NOT SUBMIT - Merge conflict marker */
+          /* Please spell |contextElement| (not |ContextElement|) below. */
           TearOffType::create(this->baseValue(), this->contextElement(),
                               PropertyIsNotAnimVal, this->attributeName());
     }
@@ -269,6 +275,8 @@ class SVGAnimatedProperty<Property, TearOffType, void>
   TearOffType* animVal() {
     if (!m_animValTearOff) {
       m_animValTearOff =
+          /* DO NOT SUBMIT - Merge conflict marker */
+          /* Please spell |contextElement| (not |ContextElement|) below. */
           TearOffType::create(this->currentValue(), this->contextElement(),
                               PropertyIsAnimVal, this->attributeName());
     }