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 c67a4cb78f9ec14a975626f069be11d54587f254..28a9a9530efb27236e8d253804f7603546f35b38 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;
 
     DCHECK(this->attributeName() != QualifiedName::null());
+    /* 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());
     }