| Index: third_party/WebKit/Source/core/svg/SVGViewSpec.h
|
| diff --git a/third_party/WebKit/Source/core/svg/SVGViewSpec.h b/third_party/WebKit/Source/core/svg/SVGViewSpec.h
|
| index 56ec82643134fb7224fa7ea404e633ebb6cf7103..ba8aad06af22f4b90cbc5120dca1d35a36f7b6a7 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGViewSpec.h
|
| +++ b/third_party/WebKit/Source/core/svg/SVGViewSpec.h
|
| @@ -66,14 +66,24 @@ class SVGViewSpec final : public GarbageCollectedFinalized<SVGViewSpec>,
|
| template <typename T>
|
| void SVGViewSpec::inheritViewAttributesFromElement(T& inheritFromElement) {
|
| if (inheritFromElement.hasValidViewBox())
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |viewBox| rather than |ViewBox| below. */
|
| setViewBox(inheritFromElement.viewBox()->currentValue()->value());
|
|
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |preserveAspectRatio| rather than |PreserveAspectRatio| below. */
|
| if (inheritFromElement.preserveAspectRatio()->isSpecified()) {
|
| setPreserveAspectRatio(
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |preserveAspectRatio| rather than |PreserveAspectRatio| below. */
|
| *inheritFromElement.preserveAspectRatio()->currentValue());
|
| }
|
|
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |hasAttribute| rather than |HasAttribute| below. */
|
| if (inheritFromElement.hasAttribute(SVGNames::zoomAndPanAttr))
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |zoomAndPan| rather than |ZoomAndPan| below. */
|
| setZoomAndPan(inheritFromElement.zoomAndPan());
|
| }
|
|
|
|
|