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/SVGAnimationElement.h b/Source/core/svg/SVGAnimationElement.h
index c3c021d..5f37fe0 100644
--- a/Source/core/svg/SVGAnimationElement.h
+++ b/Source/core/svg/SVGAnimationElement.h
@@ -26,7 +26,6 @@
#define SVGAnimationElement_h
#include "core/platform/graphics/UnitBezier.h"
-#include "core/svg/ElementTimeControl.h"
#include "core/svg/SVGAnimatedBoolean.h"
#include "core/svg/SVGExternalResourcesRequired.h"
#include "core/svg/SVGStringList.h"
@@ -67,19 +66,17 @@
class SVGAnimationElement : public SVGSMILElement,
public SVGTests,
- public SVGExternalResourcesRequired,
- public ElementTimeControl {
+ public SVGExternalResourcesRequired {
public:
// SVGAnimationElement
float getStartTime() const;
float getCurrentTime() const;
float getSimpleDuration() const;
- // ElementTimeControl
- virtual void beginElement();
- virtual void beginElementAt(float offset);
- virtual void endElement();
- virtual void endElementAt(float offset);
+ void beginElement();
+ void beginElementAt(float offset);
+ void endElement();
+ void endElementAt(float offset);
static bool isTargetAttributeCSSProperty(SVGElement*, const QualifiedName&);