Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib2112ed87a48d7a6d9c0563ba71850716d1475ef
diff --git a/Source/core/svg/SVGSwitchElement.cpp b/Source/core/svg/SVGSwitchElement.cpp
index cdd76eb..99931e9 100644
--- a/Source/core/svg/SVGSwitchElement.cpp
+++ b/Source/core/svg/SVGSwitchElement.cpp
@@ -34,12 +34,11 @@
BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGSwitchElement)
REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
- REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
- REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
+ REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
END_REGISTER_ANIMATED_PROPERTIES
inline SVGSwitchElement::SVGSwitchElement(const QualifiedName& tagName, Document* document)
- : SVGStyledTransformableElement(tagName, document)
+ : SVGGraphicsElement(tagName, document)
{
ASSERT(hasTagName(SVGNames::switchTag));
ScriptWrappable::init(this);
@@ -71,9 +70,9 @@
return false;
}
-RenderObject* SVGSwitchElement::createRenderer(RenderArena* arena, RenderStyle*)
+RenderObject* SVGSwitchElement::createRenderer(RenderStyle*)
{
- return new (arena) RenderSVGTransformableContainer(this);
+ return new (document()->renderArena()) RenderSVGTransformableContainer(this);
}
}