| 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..3e47c8b806451fb95d366ca570fac9c471468590 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGLengthContext.h
|
| +++ b/third_party/WebKit/Source/core/svg/SVGLengthContext.h
|
| @@ -45,6 +45,8 @@ class SVGLengthContext {
|
| 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());
|
|
|