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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9c754773ece5eb72450731423e2539c09ed47d0f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 2 05:27:04 2010 +0000

    2010-09-01  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Chris Marrin.
    
            animations/suspend-resume-animation.html does not pass when accelerated compositing is off
            https://bugs.webkit.org/show_bug.cgi?id=45057
    
            animations/suspend-resume-animation.html now passes with the Chromium DRT
            (it still fails with test_shell, since that doesn't have the suspend/resumeAnimations
            API implemented)
    
            * platform/chromium/drt_expectations.txt:
            * platform/chromium/test_expectations.txt:
    2010-09-01  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Chris Marrin.
    
            animations/suspend-resume-animation.html does not pass when accelerated compositing is off
            https://bugs.webkit.org/show_bug.cgi?id=45057
    
            Fix incorrect logic when resuming the animation (KeyframeAnimation::startAnimation
            and RenderLayerBacking::startAnimation return true when running an accelerated
            animation).
    
            * page/animation/AnimationBase.cpp:
            (WebCore::AnimationBase::updateStateMachine):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8de3633..2fbb1c1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-01  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Chris Marrin.
+
+        animations/suspend-resume-animation.html does not pass when accelerated compositing is off
+        https://bugs.webkit.org/show_bug.cgi?id=45057
+
+        animations/suspend-resume-animation.html now passes with the Chromium DRT
+        (it still fails with test_shell, since that doesn't have the suspend/resumeAnimations
+        API implemented)
+
+        * platform/chromium/drt_expectations.txt:
+        * platform/chromium/test_expectations.txt:
+
 2010-09-01  Matthew Willis  <lilmatt at flock.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index 7ad6c89..8cf549d 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -461,3 +461,6 @@ BUG_DRT WIN : tables/mozilla/bugs/bug96334.html = IMAGE
 BUG_DRT WIN : tables/mozilla/core/margins.html = IMAGE
 BUG_DRT WIN : tables/mozilla/dom/tableDom.html = IMAGE
 BUG_DRT WIN : transforms/2d/zoom-menulist.html = IMAGE
+
+// Tests that pass under the DRT only
+BUG_DRT : animations/suspend-resume-animation.html = PASS
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index df994d5..09b66b5 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3015,8 +3015,9 @@ BUG51416 : fast/dom/DeviceMotion/window-property.html = TEXT
 // Slow test introduced in r64817
 BUG51571 WIN : http/tests/misc/bad-charset-alias.html = TIMEOUT
 
-// Failure from http://trac.webkit.org/changeset/65107
-BUG51757 : animations/suspend-resume-animation.html = TEXT
+// test_shell doesn't expose LayoutTestController::suspend/ResumeAnimations.
+// Will pass once we've switched to the Chromium DRT.
+WONTFIX SKIP: animations/suspend-resume-animation.html = TEXT
 
 // Probably rebaseline, but want to make sure before doing so
 BUGJAPHET WIN : svg/custom/resource-invalidate-on-target-update.svg = IMAGE
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 19d3790..a909e30 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-01  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Chris Marrin.
+
+        animations/suspend-resume-animation.html does not pass when accelerated compositing is off
+        https://bugs.webkit.org/show_bug.cgi?id=45057
+
+        Fix incorrect logic when resuming the animation (KeyframeAnimation::startAnimation
+        and RenderLayerBacking::startAnimation return true when running an accelerated
+        animation).
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::updateStateMachine):
+
 2010-09-01  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/page/animation/AnimationBase.cpp b/WebCore/page/animation/AnimationBase.cpp
index 37eaae7..d4926ea 100644
--- a/WebCore/page/animation/AnimationBase.cpp
+++ b/WebCore/page/animation/AnimationBase.cpp
@@ -1114,7 +1114,7 @@ void AnimationBase::updateStateMachine(AnimStateInput input, double param)
                     } else {
                         bool started = startAnimation(beginAnimationUpdateTime() - m_startTime);
                         m_compAnim->animationController()->addToStartTimeResponseWaitList(this, started);
-                        m_isAccelerated = !started;
+                        m_isAccelerated = started;
                     }
                 }
                 break;

-- 
WebKit Debian packaging