[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

cmarrin at apple.com cmarrin at apple.com
Wed Dec 22 11:54:21 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 36a17c9e712680216559af0859db5f8d3abce3c1
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 03:40:43 2010 +0000

    another try at fixing Chromium build broken by http://trac.webkit.org/changeset/65107
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/public/WebAnimationController.h b/WebKit/chromium/public/WebAnimationController.h
index d727d70..0d3fcf5 100644
--- a/WebKit/chromium/public/WebAnimationController.h
+++ b/WebKit/chromium/public/WebAnimationController.h
@@ -51,6 +51,8 @@ public:
                                                   double time) = 0;
 
     WEBKIT_API virtual unsigned numberOfActiveAnimations() const = 0;
+    WEBKIT_API virtual void suspendAnimations() const = 0;
+    WEBKIT_API virtual void resumeAnimations() const = 0;
 protected:
     ~WebAnimationController() { }
 };
diff --git a/WebKit/chromium/src/WebAnimationControllerImpl.cpp b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
index 32a7a61..12767cb 100644
--- a/WebKit/chromium/src/WebAnimationControllerImpl.cpp
+++ b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
@@ -87,4 +87,20 @@ unsigned WebAnimationControllerImpl::numberOfActiveAnimations() const
     return controller->numberOfActiveAnimations();
 }
 
+void WebAnimationControllerImpl::suspendAnimations() const
+{
+    AnimationController* controller = animationController();
+    if (!controller)
+        return;
+    controller->suspendAnimations();
+}
+
+void WebAnimationControllerImpl::resumeAnimations() const
+{
+    AnimationController* controller = animationController();
+    if (!controller)
+        return;
+    controller->resumeAnimations();
+}
+
 } // namespace WebKit
diff --git a/WebKit/chromium/src/WebAnimationControllerImpl.h b/WebKit/chromium/src/WebAnimationControllerImpl.h
index 66dfe98..62b89f0 100644
--- a/WebKit/chromium/src/WebAnimationControllerImpl.h
+++ b/WebKit/chromium/src/WebAnimationControllerImpl.h
@@ -52,6 +52,8 @@ public:
                                        const WebString& propertyName,
                                        double time);
     virtual unsigned numberOfActiveAnimations() const;
+    virtual void suspendAnimations() const;
+    virtual void resumeAnimations() const;
 private:
     WebFrameImpl* m_frameImpl;
     WebCore::AnimationController* animationController() const;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list