| Index: third_party/WebKit/Source/core/svg/SVGLengthContext.h
|
| diff --git a/third_party/WebKit/Source/core/svg/SVGLengthContext.h b/third_party/WebKit/Source/core/svg/SVGLengthContext.h
|
| index 5ca7ed4fdc6a3f342d1142c98d2ba5aa330fcefa..0c88dec8c3f043e3a5d1769f1a0f22d67c8205ae 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGLengthContext.h
|
| +++ b/third_party/WebKit/Source/core/svg/SVGLengthContext.h
|
| @@ -44,10 +44,12 @@ class SVGLengthContext {
|
| static FloatRect resolveRectangle(const T* context,
|
| SVGUnitTypes::SVGUnitType type,
|
| const FloatRect& viewport) {
|
| - return resolveRectangle(
|
| - context, type, viewport, *context->x()->currentValue(),
|
| - *context->y()->currentValue(), *context->width()->currentValue(),
|
| - *context->height()->currentValue());
|
| + 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*,
|
|
|