Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(671)

Unified Diff: third_party/WebKit/Source/core/svg/SVGViewSpec.h

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: More fixes - things build fine at this point. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());
}

Powered by Google App Engine
This is Rietveld 408576698