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

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f03b857780b862b24b44635464b6b4346aa49432
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 04:47:11 2010 +0000

    2010-08-10  Kent Tamura  <tkent at chromium.org>
    
            Unreviewed, build fix.
    
            Chromium build fix for r65107.
    
            * src/WebAnimationControllerImpl.cpp:
            (WebKit::WebAnimationControllerImpl::suspendAnimations):
            (WebKit::WebAnimationControllerImpl::resumeAnimations):
    2010-08-10  Kent Tamura  <tkent at chromium.org>
    
            Unreviewed, build fix.
    
            Chromium build fix for r65107.
    
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (LayoutTestController::suspendAnimations):
            (LayoutTestController::resumeAnimations):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65121 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4e147ca..04bcc8e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-10  Kent Tamura  <tkent at chromium.org>
+
+        Unreviewed, build fix.
+        
+        Chromium build fix for r65107.
+
+        * src/WebAnimationControllerImpl.cpp:
+        (WebKit::WebAnimationControllerImpl::suspendAnimations):
+        (WebKit::WebAnimationControllerImpl::resumeAnimations):
+
 2010-08-10  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/WebAnimationControllerImpl.cpp b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
index 12767cb..15df140 100644
--- a/WebKit/chromium/src/WebAnimationControllerImpl.cpp
+++ b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
@@ -92,7 +92,9 @@ void WebAnimationControllerImpl::suspendAnimations() const
     AnimationController* controller = animationController();
     if (!controller)
         return;
-    controller->suspendAnimations();
+    if (!m_frameImpl->frame())
+        return;
+    controller->suspendAnimations(m_frameImpl->frame()->document());
 }
 
 void WebAnimationControllerImpl::resumeAnimations() const
@@ -100,7 +102,9 @@ void WebAnimationControllerImpl::resumeAnimations() const
     AnimationController* controller = animationController();
     if (!controller)
         return;
-    controller->resumeAnimations();
+    if (!m_frameImpl->frame())
+        return;
+    controller->resumeAnimations(m_frameImpl->frame()->document());
 }
 
 } // namespace WebKit
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index aba0d26..863b832 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-10  Kent Tamura  <tkent at chromium.org>
+
+        Unreviewed, build fix.
+        
+        Chromium build fix for r65107.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::suspendAnimations):
+        (LayoutTestController::resumeAnimations):
+
 2010-08-10  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index d0503a0..beae21e 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -850,7 +850,7 @@ void LayoutTestController::suspendAnimations()
     if (!controller)
         return;
 
-    controller->suspendAnimations(webFrame->document());
+    controller->suspendAnimations();
 }
 
 void LayoutTestController::resumeAnimations()
@@ -863,7 +863,7 @@ void LayoutTestController::resumeAnimations()
     if (!controller)
         return;
 
-    controller->resumeAnimations(webFrame->document());
+    controller->resumeAnimations();
 }
 
 void LayoutTestController::pauseAnimationAtTimeOnElementWithId(const CppArgumentList& arguments, CppVariant* result)

-- 
WebKit Debian packaging