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

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
 G*     * Redistributions in binary form must reproduce the above
@@ skipping 178 matching lines @@
 
   // baseVal()/setBaseVal()/animVal() are only to be used from SVG DOM
   // implementation.  Use currentValue() from C++ code.
   PrimitiveType baseVal() { return this->baseValue()->value(); }
 
   void setBaseVal(PrimitiveType value, ExceptionState&) {
     this->baseValue()->setValue(value);
     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();
   }
 
  protected:
   SVGAnimatedProperty(SVGElement* contextElement,
                       const QualifiedName& attributeName,
                       Property* initialValue,
                       CSSPropertyID cssPropertyId = CSSPropertyInvalid)
       : SVGAnimatedPropertyCommon<Property>(contextElement,
@@ skipping 39 matching lines @@
     return m_baseValTearOff || this->isAnimating();
   }
 
   // SVGAnimated* DOM Spec implementations:
 
   // baseVal()/animVal() are only to be used from SVG DOM implementation.
   // Use currentValue() from C++ code.
   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());
     }
     return m_baseValTearOff;
   }
 
   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());
     }
     return m_animValTearOff;
   }
 
   DEFINE_INLINE_VIRTUAL_TRACE() {
     visitor->trace(m_baseValTearOff);
     visitor->trace(m_animValTearOff);
     SVGAnimatedPropertyCommon<Property>::trace(visitor);
@@ skipping 53 matching lines @@
                       CSSPropertyID cssPropertyId = CSSPropertyInvalid)
       : SVGAnimatedPropertyCommon<Property>(contextElement,
                                             attributeName,
                                             initialValue,
                                             cssPropertyId) {}
 };
 
 }  // namespace blink
 
 #endif  // SVGAnimatedProperty_h