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

third_party/WebKit/Source/core/svg/SVGLengthContext.h

 /*
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 27 matching lines @@
   STACK_ALLOCATED();
 
  public:
   explicit SVGLengthContext(const SVGElement*);
 
   template <typename T>
   static FloatRect resolveRectangle(const T* context,
                                     SVGUnitTypes::SVGUnitType type,
                                     const FloatRect& viewport) {
     return resolveRectangle(
+        /* DO NOT SUBMIT - merge conflict marker
+         * Spell |x|, |y|, |width|, |height| below. */
         context, type, viewport, *context->x()->currentValue(),
         *context->y()->currentValue(), *context->width()->currentValue(),
         *context->height()->currentValue());
   }
 
   static FloatRect resolveRectangle(const SVGElement*,
                                     SVGUnitTypes::SVGUnitType,
                                     const FloatRect& viewport,
                                     const SVGLength& x,
                                     const SVGLength& y,
@@ skipping 35 matching lines @@
 
   float convertValueFromUserUnitsToCHS(float value) const;
   float convertValueFromCHSToUserUnits(float value) const;
 
   Member<const SVGElement> m_context;
 };
 
 }  // namespace blink
 
 #endif  // SVGLengthContext_h