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

Unified Diff: Source/core/svg/SVGMarkerElement.cpp

Issue 169033002: Drop [LegacyImplementedInBaseClass] from SVGFitToViewBox IDL interface (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 10 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
« no previous file with comments | « Source/core/svg/SVGMarkerElement.h ('k') | Source/core/svg/SVGPatternElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGMarkerElement.cpp
diff --git a/Source/core/svg/SVGMarkerElement.cpp b/Source/core/svg/SVGMarkerElement.cpp
index ecd40108f0e1bb6ba290392a7e90047d36dbb42a..7ca8285ebeda9c09180636f25147b5a0a809fd30 100644
--- a/Source/core/svg/SVGMarkerElement.cpp
+++ b/Source/core/svg/SVGMarkerElement.cpp
@@ -57,12 +57,11 @@ END_REGISTER_ANIMATED_PROPERTIES
inline SVGMarkerElement::SVGMarkerElement(Document& document)
: SVGElement(SVGNames::markerTag, document)
+ , SVGFitToViewBox(this)
, m_refX(SVGAnimatedLength::create(this, SVGNames::refXAttr, SVGLength::create(LengthModeWidth)))
, m_refY(SVGAnimatedLength::create(this, SVGNames::refXAttr, SVGLength::create(LengthModeWidth)))
, m_markerWidth(SVGAnimatedLength::create(this, SVGNames::markerWidthAttr, SVGLength::create(LengthModeWidth)))
, m_markerHeight(SVGAnimatedLength::create(this, SVGNames::markerHeightAttr, SVGLength::create(LengthModeHeight)))
- , m_viewBox(SVGAnimatedRect::create(this, SVGNames::viewBoxAttr))
- , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
, m_orientType(SVGMarkerOrientAngle)
, m_markerUnits(SVGMarkerUnitsStrokeWidth)
{
@@ -76,9 +75,7 @@ inline SVGMarkerElement::SVGMarkerElement(Document& document)
addToPropertyMap(m_refY);
addToPropertyMap(m_markerWidth);
addToPropertyMap(m_markerHeight);
- addToPropertyMap(m_viewBox);
- addToPropertyMap(m_preserveAspectRatio);
registerAnimatedPropertiesForSVGMarkerElement();
}
@@ -101,7 +98,7 @@ const AtomicString& SVGMarkerElement::orientAngleIdentifier()
AffineTransform SVGMarkerElement::viewBoxToViewTransform(float viewWidth, float viewHeight) const
{
- return SVGFitToViewBox::viewBoxToViewTransform(m_viewBox->currentValue()->value(), m_preserveAspectRatio->currentValue(), viewWidth, viewHeight);
+ return SVGFitToViewBox::viewBoxToViewTransform(viewBox()->currentValue()->value(), preserveAspectRatio()->currentValue(), viewWidth, viewHeight);
}
bool SVGMarkerElement::isSupportedAttribute(const QualifiedName& attrName)
@@ -144,9 +141,10 @@ void SVGMarkerElement::parseAttribute(const QualifiedName& name, const AtomicStr
setOrientTypeBaseValue(orientType);
if (orientType == SVGMarkerOrientAngle)
setOrientAngleBaseValue(angle);
- } else if (SVGFitToViewBox::parseAttribute(this, name, value)) {
- } else
+ } else if (SVGFitToViewBox::parseAttribute(name, value, document(), parseError)) {
+ } else {
ASSERT_NOT_REACHED();
+ }
reportAttributeParsingError(parseError, name, value);
}
« no previous file with comments | « Source/core/svg/SVGMarkerElement.h ('k') | Source/core/svg/SVGPatternElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698