[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:10 UTC 2010


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

    Fix for Windows build, broken by http://trac.webkit.org/changeset/65107
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index f68d373..500a643 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -1301,13 +1301,13 @@ HRESULT WebFrame::suspendAnimations()
 {
     Frame* frame = core(this);
     if (!frame)
-        return;
+        return E_FAIL;
 
     AnimationController* controller = frame->animation();
     if (!controller)
-        return;
+        return E_FAIL;
 
-    controller->suspendAnimations();
+    controller->suspendAnimations(frame->document());
     return S_OK;
 }
 
@@ -1315,13 +1315,13 @@ HRESULT WebFrame::resumeAnimations()
 {
     Frame* frame = core(this);
     if (!frame)
-        return;
+        return E_FAIL;
 
     AnimationController* controller = frame->animation();
     if (!controller)
-        return;
+        return E_FAIL;
 
-    controller->resumeAnimations();
+    controller->resumeAnimations(frame->document());
     return S_OK;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list