Changeset 153396 in webkit

Timestamp:

Jul 26, 2013 5:57:31 PM (11 years ago)

Author:

dino@apple.com

Message:

Allow new transitions to run even when controller is suspended
​https://bugs.webkit.org/show_bug.cgi?id=119171
<rdar://problem/14511404>

Reviewed by Simon Fraser.

Source/WebCore:

Expose a new property on AnimationController that allows newly created
animations to run even if the controller says it is suspended. See WebKit
ChangeLog for more details.

Test: transitions/created-while-suspended.html

• WebCore.exp.in: Export the new methods so WebView can use them.
• page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::AnimationControllerPrivate): Initialize new flag to false.
(WebCore::AnimationControllerPrivate::startAnimationsIfNotSuspended): Check new flag is not true.
(WebCore::AnimationControllerPrivate::setAllowsNewAnimationsWhileSuspended): Expose setter.
(WebCore::AnimationController::allowsNewAnimationsWhileSuspended): "Public" getter.
(WebCore::AnimationController::setAllowsNewAnimationsWhileSuspended): "Public" setter.

• page/animation/AnimationController.h:
• page/animation/AnimationControllerPrivate.h:

(WebCore::AnimationControllerPrivate::allowsNewAnimationsWhileSuspended):

• page/animation/CompositeAnimation.cpp:

(WebCore::CompositeAnimation::CompositeAnimation): Only suspend if new flag is false. Everything else
relies on the m_suspended flag, so the real code change is this one line.

Source/WebKit/mac:

Expose a new SPI on WebView that triggers the (buggy) old behaviour
for animations, such that any newly created animations will start even
when the document is supposedly suspended. It turns out that client content was
unknowingly relying on this behaviour - e.g. suspending a view, loading a
bunch of new content, bringing the view on screen and then unsuspending. In this
situation, we were not running CSS transitions, because the page was suspended.
However, JS was still triggering them, and content was expecting a transitionEnd event.

• WebView/WebView.mm:

(-[WebView allowsNewCSSAnimationsWhileSuspended]): Calls into AnimationController.
(-[WebView setAllowsNewCSSAnimationsWhileSuspended:]): Ditto.

• WebView/WebViewPrivate.h: New methods listed above.

LayoutTests:

This is actually a test to make sure this fix didn't break anything. There is no
way to trigger the new behaviour from the test system (or from Safari).

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/transitions/created-while-suspended-expected.txt (added)
• LayoutTests/transitions/created-while-suspended.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebCore/page/animation/AnimationController.cpp (modified) (3 diffs)
• Source/WebCore/page/animation/AnimationController.h (modified) (1 diff)
• Source/WebCore/page/animation/AnimationControllerPrivate.h (modified) (2 diffs)
• Source/WebCore/page/animation/CompositeAnimation.cpp (modified) (1 diff)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• Source/WebKit/mac/WebView/WebViewPrivate.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-26  Dean Jackson  <dino@apple.com>
+
+        Allow new transitions to run even when controller is suspended
+        https://bugs.webkit.org/show_bug.cgi?id=119171
+        <rdar://problem/14511404>
+
+        Reviewed by Simon Fraser.
+
+        This is actually a test to make sure this fix didn't break anything. There is no
+        way to trigger the new behaviour from the test system (or from Safari).
+
 2013-07-26  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-26  Dean Jackson  <dino@apple.com>
+
+        Allow new transitions to run even when controller is suspended
+        https://bugs.webkit.org/show_bug.cgi?id=119171
+        <rdar://problem/14511404>
+
+        Reviewed by Simon Fraser.
+
+        Expose a new property on AnimationController that allows newly created
+        animations to run even if the controller says it is suspended. See WebKit
+        ChangeLog for more details.
+
+        Test: transitions/created-while-suspended.html
+
+        * WebCore.exp.in: Export the new methods so WebView can use them.
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::AnimationControllerPrivate): Initialize new flag to false.
+        (WebCore::AnimationControllerPrivate::startAnimationsIfNotSuspended): Check new flag is not true.
+        (WebCore::AnimationControllerPrivate::setAllowsNewAnimationsWhileSuspended): Expose setter.
+        (WebCore::AnimationController::allowsNewAnimationsWhileSuspended): "Public" getter.
+        (WebCore::AnimationController::setAllowsNewAnimationsWhileSuspended): "Public" setter.
+        * page/animation/AnimationController.h:
+        * page/animation/AnimationControllerPrivate.h:
+        (WebCore::AnimationControllerPrivate::allowsNewAnimationsWhileSuspended):
+        * page/animation/CompositeAnimation.cpp:
+        (WebCore::CompositeAnimation::CompositeAnimation): Only suspend if new flag is false. Everything else
+        relies on the m_suspended flag, so the real code change is this one line.
+
 2013-07-26  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -623 +623 @@
 __ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF12AtomicStringEd
 __ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
+__ZN7WebCore19AnimationController36setAllowsNewAnimationsWhileSuspendedEb
+__ZNK7WebCore19AnimationController33allowsNewAnimationsWhileSuspendedEv
 __ZN7WebCore19BackForwardListImpl10removeItemEPNS_11HistoryItemE
 __ZN7WebCore19BackForwardListImpl10setEnabledEb

trunk/Source/WebCore/page/animation/AnimationController.cpp

@@ -60 +60 @@
     , m_waitingForAsyncStartNotification(false)
     , m_isSuspended(false)
+    , m_allowsNewAnimationsWhileSuspended(false)
 {
 }
@@ -323 +324 @@
 void AnimationControllerPrivate::startAnimationsIfNotSuspended(Document* document)
 {
-    if (!isSuspended())
+    if (!isSuspended() || allowsNewAnimationsWhileSuspended())
         resumeAnimationsForDocument(document);
+}
+
+void AnimationControllerPrivate::setAllowsNewAnimationsWhileSuspended(bool allowed)
+{
+    m_allowsNewAnimationsWhileSuspended = allowed;
 }
 
@@ -604 +610 @@
 }
 
+bool AnimationController::allowsNewAnimationsWhileSuspended() const
+{
+    return m_data->allowsNewAnimationsWhileSuspended();
+}
+
+void AnimationController::setAllowsNewAnimationsWhileSuspended(bool allowed)
+{
+    m_data->setAllowsNewAnimationsWhileSuspended(allowed);
+}
+
 #if ENABLE(REQUEST_ANIMATION_FRAME)
 void AnimationController::serviceAnimations()

trunk/Source/WebCore/page/animation/AnimationController.h

@@ -77 +77 @@
     void beginAnimationUpdate();
     void endAnimationUpdate();
+
+    bool allowsNewAnimationsWhileSuspended() const;
+    void setAllowsNewAnimationsWhileSuspended(bool);
     
     static bool supportsAcceleratedAnimationOfProperty(CSSPropertyID);

trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h

@@ -110 +110 @@
 
     void updateAnimationTimerForRenderer(RenderObject*);
-    
+
+    bool allowsNewAnimationsWhileSuspended() const { return m_allowsNewAnimationsWhileSuspended; }
+    void setAllowsNewAnimationsWhileSuspended(bool);
+
 private:
     void animationTimerFired(Timer<AnimationControllerPrivate>*);
@@ -143 +146 @@
     bool m_waitingForAsyncStartNotification;
     bool m_isSuspended;
+
+    // Used to flag whether we should revert to previous buggy
+    // behavior of allowing new transitions and animations to
+    // run even when this object is suspended.
+    bool m_allowsNewAnimationsWhileSuspended;
 };
 

trunk/Source/WebCore/page/animation/CompositeAnimation.cpp

@@ -45 +45 @@
     : m_animationController(animationController)
 {
-    m_suspended = animationController->isSuspended();
+    m_suspended = animationController->isSuspended() && !animationController->allowsNewAnimationsWhileSuspended();
 }
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-07-26  Dean Jackson  <dino@apple.com>
+
+        Allow new transitions to run even when controller is suspended
+        https://bugs.webkit.org/show_bug.cgi?id=119171
+        <rdar://problem/14511404>
+
+        Reviewed by Simon Fraser.
+
+        Expose a new SPI on WebView that triggers the (buggy) old behaviour
+        for animations, such that any newly created animations will start even
+        when the document is supposedly suspended. It turns out that client content was
+        unknowingly relying on this behaviour - e.g. suspending a view, loading a
+        bunch of new content, bringing the view on screen and then unsuspending. In this
+        situation, we were not running CSS transitions, because the page was suspended.
+        However, JS was still triggering them, and content was expecting a transitionEnd event.
+
+        * WebView/WebView.mm:
+        (-[WebView allowsNewCSSAnimationsWhileSuspended]): Calls into AnimationController.
+        (-[WebView setAllowsNewCSSAnimationsWhileSuspended:]): Ditto.
+        * WebView/WebViewPrivate.h: New methods listed above.
+
 2013-07-26  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -2791 +2791 @@
 }
 
+- (BOOL)allowsNewCSSAnimationsWhileSuspended
+{
+    Frame* frame = core([self mainFrame]);
+    if (frame)
+        return frame->animation()->allowsNewAnimationsWhileSuspended();
+
+    return false;
+}
+
+- (void)setAllowsNewCSSAnimationsWhileSuspended:(BOOL)allowed
+{
+    Frame* frame = core([self mainFrame]);
+    if (frame)
+        frame->animation()->setAllowsNewAnimationsWhileSuspended(allowed);
+}
+
 - (BOOL)cssAnimationsSuspended
 {

trunk/Source/WebKit/mac/WebView/WebViewPrivate.h

@@ -565 +565 @@
 - (void)setCSSAnimationsSuspended:(BOOL)suspended;
 
+/*
+    SPI to revert back to buggy behavior that would allow new transitions
+    and animations to run even when the view is suspended (e.g. loading a
+    new document).
+*/
+- (BOOL)allowsNewCSSAnimationsWhileSuspended;
+- (void)setAllowsNewCSSAnimationsWhileSuspended:(BOOL)allowed;
+
 + (void)_setDomainRelaxationForbidden:(BOOL)forbidden forURLScheme:(NSString *)scheme;
 + (void)_registerURLSchemeAsSecure:(NSString *)scheme;