| 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 3d7ea0384d9da25c484baab9372a34e9b057cf17..40b82a73656b9a661eb39fdc4a7d88adf3b7f674 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGViewSpec.h
|
| +++ b/third_party/WebKit/Source/core/svg/SVGViewSpec.h
|
| @@ -64,17 +64,27 @@ class SVGViewSpec final : public GarbageCollectedFinalized<SVGViewSpec>,
|
| };
|
|
|
| template <typename T>
|
| -void SVGViewSpec::inheritViewAttributesFromElement(T& inheritFromElement) {
|
| - if (!inheritFromElement.hasEmptyViewBox())
|
| - setViewBox(inheritFromElement.viewBox()->currentValue()->value());
|
| -
|
| - if (inheritFromElement.preserveAspectRatio()->isSpecified()) {
|
| - setPreserveAspectRatio(
|
| - *inheritFromElement.preserveAspectRatio()->currentValue());
|
| +void SVGViewSpec::InheritViewAttributesFromElement(T& inherit_from_element) {
|
| + if (!inherit_from_element.HasEmptyViewBox())
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |viewBox| rather than |ViewBox| below. */
|
| + SetViewBox(inherit_from_element.viewBox()->CurrentValue()->Value());
|
| +
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |preserveAspectRatio| rather than |PreserveAspectRatio| below. */
|
| + if (inherit_from_element.preserveAspectRatio()->IsSpecified()) {
|
| + SetPreserveAspectRatio(
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |preserveAspectRatio| rather than |PreserveAspectRatio| below. */
|
| + *inherit_from_element.preserveAspectRatio()->CurrentValue());
|
| }
|
|
|
| - if (inheritFromElement.hasAttribute(SVGNames::zoomAndPanAttr))
|
| - setZoomAndPan(inheritFromElement.zoomAndPan());
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |hasAttribute| rather than |HasAttribute| below. */
|
| + if (inherit_from_element.hasAttribute(SVGNames::zoomAndPanAttr))
|
| + /* DO NOT SUBMIT - merge conflict marker:
|
| + * Spell |zoomAndPan| rather than |ZoomAndPan| below. */
|
| + setZoomAndPan(inherit_from_element.zoomAndPan());
|
| }
|
|
|
| } // namespace blink
|
|
|