Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebKit / chromium / src / WebAnimationControllerImpl.cpp

diff --git a/WebKit/chromium/src/WebAnimationControllerImpl.cpp b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
index 32a7a61..e6eb828 100644 (file)
--- a/WebKit/chromium/src/WebAnimationControllerImpl.cpp
+++ b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
@@ -87,4 +87,24 @@ unsigned WebAnimationControllerImpl::numberOfActiveAnimations() const
     return controller->numberOfActiveAnimations();
 }
 
+void WebAnimationControllerImpl::suspendAnimations() const
+{
+    AnimationController* controller = animationController();
+    if (!controller)
+        return;
+    if (!m_frameImpl->frame())
+        return;
+    controller->suspendAnimations();
+}
+
+void WebAnimationControllerImpl::resumeAnimations() const
+{
+    AnimationController* controller = animationController();
+    if (!controller)
+        return;
+    if (!m_frameImpl->frame())
+        return;
+    controller->resumeAnimations();
+}
+
 } // namespace WebKit