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

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

Issue 153883003: [SVG] SVGAnimatedTransform{,List} migration to new SVG property impl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove m_zoomAndPan 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/SVGPatternElement.h ('k') | Source/core/svg/SVGPointList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGPatternElement.cpp
diff --git a/Source/core/svg/SVGPatternElement.cpp b/Source/core/svg/SVGPatternElement.cpp
index f2c052cd675ad87c6fda2c40ed800e5e3a2a6f06..08289b702893f8b4762b000111e6c116791e57bb 100644
--- a/Source/core/svg/SVGPatternElement.cpp
+++ b/Source/core/svg/SVGPatternElement.cpp
@@ -33,10 +33,7 @@
namespace WebCore {
// Animated property definitions
-DEFINE_ANIMATED_TRANSFORM_LIST(SVGPatternElement, SVGNames::patternTransformAttr, PatternTransform, patternTransform)
-
BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGPatternElement)
- REGISTER_LOCAL_ANIMATED_PROPERTY(patternTransform)
REGISTER_PARENT_ANIMATED_PROPERTIES(SVGElement)
END_REGISTER_ANIMATED_PROPERTIES
@@ -49,6 +46,7 @@ inline SVGPatternElement::SVGPatternElement(Document& document)
, m_y(SVGAnimatedLength::create(this, SVGNames::yAttr, SVGLength::create(LengthModeHeight)))
, m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr, SVGLength::create(LengthModeWidth)))
, m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength::create(LengthModeHeight)))
+ , m_patternTransform(SVGAnimatedTransformList::create(this, SVGNames::patternTransformAttr, SVGTransformList::create()))
, m_patternUnits(SVGAnimatedEnumeration<SVGUnitTypes::SVGUnitType>::create(this, SVGNames::patternUnitsAttr, SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX))
, m_patternContentUnits(SVGAnimatedEnumeration<SVGUnitTypes::SVGUnitType>::create(this, SVGNames::patternContentUnitsAttr, SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE))
{
@@ -58,6 +56,7 @@ inline SVGPatternElement::SVGPatternElement(Document& document)
addToPropertyMap(m_y);
addToPropertyMap(m_width);
addToPropertyMap(m_height);
+ addToPropertyMap(m_patternTransform);
addToPropertyMap(m_patternUnits);
addToPropertyMap(m_patternContentUnits);
registerAnimatedPropertiesForSVGPatternElement();
@@ -97,11 +96,7 @@ void SVGPatternElement::parseAttribute(const QualifiedName& name, const AtomicSt
} else if (name == SVGNames::patternContentUnitsAttr) {
m_patternContentUnits->setBaseValueAsString(value, parseError);
} else if (name == SVGNames::patternTransformAttr) {
- SVGTransformList newList;
- newList.parse(value);
- detachAnimatedPatternTransformListWrappers(newList.size());
- setPatternTransformBaseValue(newList);
- return;
+ m_patternTransform->setBaseValueAsString(value, parseError);
} else if (name == SVGNames::xAttr) {
m_x->setBaseValueAsString(value, AllowNegativeLengths, parseError);
} else if (name == SVGNames::yAttr) {
@@ -182,9 +177,9 @@ static void setPatternAttributes(const SVGPatternElement* element, PatternAttrib
if (!attributes.hasPatternContentUnits() && element->patternContentUnits()->isSpecified())
attributes.setPatternContentUnits(element->patternContentUnits()->currentValue()->enumValue());
- if (!attributes.hasPatternTransform() && element->patternTransformSpecified()) {
+ if (!attributes.hasPatternTransform() && element->patternTransform()->isSpecified()) {
AffineTransform transform;
- element->patternTransformCurrentValue().concatenate(transform);
+ element->patternTransform()->currentValue()->concatenate(transform);
attributes.setPatternTransform(transform);
}
@@ -220,7 +215,7 @@ void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes)
AffineTransform SVGPatternElement::localCoordinateSpaceTransform(SVGElement::CTMScope) const
{
AffineTransform matrix;
- patternTransformCurrentValue().concatenate(matrix);
+ m_patternTransform->currentValue()->concatenate(matrix);
return matrix;
}
« no previous file with comments | « Source/core/svg/SVGPatternElement.h ('k') | Source/core/svg/SVGPointList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698