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.

Side by Side 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 unified diff | Download patch

« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGLengthContext.h ('k') | third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007 Rob Buis <buis@kde.org>	2 * Copyright (C) 2007 Rob Buis <buis@kde.org>

3 *	3 *

4 * This library is free software; you can redistribute it and/or	4 * This library is free software; you can redistribute it and/or

5 * modify it under the terms of the GNU Library General Public	5 * modify it under the terms of the GNU Library General Public

6 * License as published by the Free Software Foundation; either	6 * License as published by the Free Software Foundation; either

7 * version 2 of the License, or (at your option) any later version.	7 * version 2 of the License, or (at your option) any later version.

8 *	8 *

9 * This library is distributed in the hope that it will be useful,	9 * This library is distributed in the hope that it will be useful,

10 * but WITHOUT ANY WARRANTY; without even the implied warranty of	10 * but WITHOUT ANY WARRANTY; without even the implied warranty of

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 void setPreserveAspectRatio(const SVGPreserveAspectRatio&);	59 void setPreserveAspectRatio(const SVGPreserveAspectRatio&);

60	60

61 Member<SVGRect> m_viewBox;	61 Member<SVGRect> m_viewBox;

62 Member<SVGPreserveAspectRatio> m_preserveAspectRatio;	62 Member<SVGPreserveAspectRatio> m_preserveAspectRatio;

63 Member<SVGTransformList> m_transform;	63 Member<SVGTransformList> m_transform;

64 };	64 };

65	65

66 template <typename T>	66 template <typename T>

67 void SVGViewSpec::inheritViewAttributesFromElement(T& inheritFromElement) {	67 void SVGViewSpec::inheritViewAttributesFromElement(T& inheritFromElement) {

68 if (inheritFromElement.hasValidViewBox())	68 if (inheritFromElement.hasValidViewBox())

	69 /* DO NOT SUBMIT - merge conflict marker:

	70 * Spell \|viewBox\| rather than \|ViewBox\| below. */

69 setViewBox(inheritFromElement.viewBox()->currentValue()->value());	71 setViewBox(inheritFromElement.viewBox()->currentValue()->value());

70	72

	73 /* DO NOT SUBMIT - merge conflict marker:

	74 * Spell \|preserveAspectRatio\| rather than \|PreserveAspectRatio\| below. */

71 if (inheritFromElement.preserveAspectRatio()->isSpecified()) {	75 if (inheritFromElement.preserveAspectRatio()->isSpecified()) {

72 setPreserveAspectRatio(	76 setPreserveAspectRatio(

	77 /* DO NOT SUBMIT - merge conflict marker:

	78 * Spell \|preserveAspectRatio\| rather than \|PreserveAspectRatio\| below. */

73 *inheritFromElement.preserveAspectRatio()->currentValue());	79 *inheritFromElement.preserveAspectRatio()->currentValue());

74 }	80 }

75	81

	82 /* DO NOT SUBMIT - merge conflict marker:

	83 * Spell \|hasAttribute\| rather than \|HasAttribute\| below. */

76 if (inheritFromElement.hasAttribute(SVGNames::zoomAndPanAttr))	84 if (inheritFromElement.hasAttribute(SVGNames::zoomAndPanAttr))

	85 /* DO NOT SUBMIT - merge conflict marker:

	86 * Spell \|zoomAndPan\| rather than \|ZoomAndPan\| below. */

77 setZoomAndPan(inheritFromElement.zoomAndPan());	87 setZoomAndPan(inheritFromElement.zoomAndPan());

78 }	88 }

79	89

80 } // namespace blink	90 } // namespace blink

81	91

82 #endif // SVGViewSpec_h	92 #endif // SVGViewSpec_h

OLD	NEW