Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / svg / properties / SVGAnimatedProperty.cpp

diff --git a/src/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.cpp b/src/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.cpp
index a3ec340..9406d2c 100644 (file)
--- a/src/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.cpp
+++ b/src/third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.cpp
@@ -51,7 +51,11 @@ SVGAnimatedPropertyBase::SVGAnimatedPropertyBase(AnimatedPropertyType type, SVGE
 
 SVGAnimatedPropertyBase::~SVGAnimatedPropertyBase()
 {
+    // FIXME: Oilpan: We need to investigate why this assert fails in
+    // Oilpan builds.
+#if !ENABLE(OILPAN)
     ASSERT(!isAnimating());
+#endif
 }
 
 void SVGAnimatedPropertyBase::animationStarted()
@@ -62,6 +66,7 @@ void SVGAnimatedPropertyBase::animationStarted()
 
 void SVGAnimatedPropertyBase::animationEnded()
 {
+    synchronizeAttribute();
     ASSERT(isAnimating());
     m_isAnimating = false;
 }