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

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

Issue 660653004: Move supplemental transform to rare data (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 6 years, 2 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/SVGGraphicsElement.h ('k') | Source/core/svg/SVGTextElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGGraphicsElement.cpp
diff --git a/Source/core/svg/SVGGraphicsElement.cpp b/Source/core/svg/SVGGraphicsElement.cpp
index 08e178a6969d1cfb0b55bb502638960209e31e5e..42dcf67405c4587edff3a70c38320d8197b6ff3d 100644
--- a/Source/core/svg/SVGGraphicsElement.cpp
+++ b/Source/core/svg/SVGGraphicsElement.cpp
@@ -24,9 +24,11 @@
#include "core/svg/SVGGraphicsElement.h"
#include "core/SVGNames.h"
+#include "core/css/resolver/StyleResolver.h"
#include "core/rendering/svg/RenderSVGPath.h"
#include "core/rendering/svg/RenderSVGResource.h"
#include "core/rendering/svg/SVGPathData.h"
+#include "core/svg/SVGElementRareData.h"
#include "platform/transforms/AffineTransform.h"
namespace blink {
@@ -155,16 +157,14 @@ AffineTransform SVGGraphicsElement::animatedLocalTransform() const
m_transform->currentValue()->concatenate(matrix);
}
- if (m_supplementalTransform)
- return *m_supplementalTransform * matrix;
+ if (hasSVGRareData())
+ return *svgRareData()->animateMotionTransform() * matrix;
return matrix;
}
-AffineTransform* SVGGraphicsElement::supplementalTransform()
+AffineTransform* SVGGraphicsElement::animateMotionTransform()
{
- if (!m_supplementalTransform)
- m_supplementalTransform = adoptPtr(new AffineTransform);
- return m_supplementalTransform.get();
+ return ensureSVGRareData()->animateMotionTransform();
}
bool SVGGraphicsElement::isSupportedAttribute(const QualifiedName& attrName)
« no previous file with comments | « Source/core/svg/SVGGraphicsElement.h ('k') | Source/core/svg/SVGTextElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698