Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: I5b225b76b2157384357897051ee5866dd4bb23a8
diff --git a/Source/core/svg/SVGAnimationElement.h b/Source/core/svg/SVGAnimationElement.h
index fc7c399..c3c021d 100644
--- a/Source/core/svg/SVGAnimationElement.h
+++ b/Source/core/svg/SVGAnimationElement.h
@@ -25,7 +25,6 @@
#ifndef SVGAnimationElement_h
#define SVGAnimationElement_h
-#if ENABLE(SVG)
#include "core/platform/graphics/UnitBezier.h"
#include "core/svg/ElementTimeControl.h"
#include "core/svg/SVGAnimatedBoolean.h"
@@ -74,7 +73,7 @@
// SVGAnimationElement
float getStartTime() const;
float getCurrentTime() const;
- float getSimpleDuration(ExceptionCode&) const;
+ float getSimpleDuration() const;
// ElementTimeControl
virtual void beginElement();
@@ -255,5 +254,4 @@
} // namespace WebCore
-#endif // ENABLE(SVG)
#endif // SVGAnimationElement_h