Changeset 71424 in webkit

Timestamp:

Nov 5, 2010 9:38:46 AM (13 years ago)

Author:

cmarrin@apple.com

Message:

2010-11-05 Chris Marrin <​cmarrin@apple.com>

Reviewed by Simon Fraser.

Make suspendAnimations/resumeAnimations and setCSSAnimations traverse through subframes and remember state
​https://bugs.webkit.org/show_bug.cgi?id=46945

Add new funtions to suspend and resume animations. The go through all subframes and suspend or resume them
recursively.

Test: animations/stop-animation-on-suspend.html

• WebCore.exp.in:
• page/Frame.cpp: (WebCore::Frame::suspendAnimations): (WebCore::Frame::resumeAnimations):
• page/Frame.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/animation-test-helpers.js (modified) (6 diffs)
• LayoutTests/animations/resources/stop-animation-on-suspend-subframe.html (added)
• LayoutTests/animations/stop-animation-on-suspend-expected.txt (added)
• LayoutTests/animations/stop-animation-on-suspend.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (1 diff)
• WebCore/page/Frame.h (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebframe.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebFrame.mm (modified) (2 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebFrame.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-05  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Make suspendAnimations/resumeAnimations and setCSSAnimations traverse through subframes and remember state
+        https://bugs.webkit.org/show_bug.cgi?id=46945
+
+        New test which starts animations in the page an in an iframe. Makes sure both animations
+        stop when suspendAnimations is called. I also added dot notation syntax to animation-test-helpers.js
+        that can dig down into iframes to values for testing.
+
+        * animations/animation-test-helpers.js:
+        (checkExpectedValue):
+        * animations/stop-animation-on-suspend-expected.txt: Added.
+        * animations/stop-animation-on-suspend.html: Added.
+
 2010-11-05  Stephen White  <senorblanco@chromium.org>
 

trunk/LayoutTests/animations/animation-test-helpers.js

@@ -24 +24 @@
     are the ids of 2 elements, whose values are compared for equality. In this case the expected value is ignored
     but the tolerance is used in the comparison.
+    
+    If a string with a '.' is passed, this is an element in an iframe. The string before the dot is the iframe id
+    and the string after the dot is the element name in that iframe.
 
     [3] If the CSS property name is "webkitTransform", expected value must be an array of 1 or more numbers corresponding to the matrix elements,
@@ -66 +69 @@
         compareElements = true;
     }
+    
+    // Check for a dot separated string
+    var iframeId;
+    if (!compareElements) {
+        var array = elementId.split('.');
+        if (array.length == 2) {
+            iframeId = array[0];
+            elementId = array[1];
+        }
+    }
 
     if (animationName && hasPauseAnimationAPI && !layoutTestController.pauseAnimationAtTimeOnElementWithId(animationName, time, elementId)) {
@@ -80 +93 @@
     var pass = true;
     if (!property.indexOf("webkitTransform")) {
-        computedValue = window.getComputedStyle(document.getElementById(elementId)).webkitTransform;
+        var element;
+        if (iframeId)
+            element = document.getElementById(iframeId).contentDocument.getElementById(elementId);
+        else
+            element = document.getElementById(elementId);
+            
+        computedValue = window.getComputedStyle(element).webkitTransform;
         if (compareElements) {
             computedValue2 = window.getComputedStyle(document.getElementById(elementId2)).webkitTransform;
@@ -109 +128 @@
         }
     } else if (property == "lineHeight") {
-        computedValue = parseInt(window.getComputedStyle(document.getElementById(elementId)).lineHeight);
+        var element;
+        if (iframeId)
+            element = document.getElementById(iframeId).contentDocument.getElementById(elementId);
+        else
+            element = document.getElementById(elementId);
+            
+        computedValue = parseInt(window.getComputedStyle(element).lineHeight);
         if (compareElements) {
             computedValue2 = parseInt(window.getComputedStyle(document.getElementById(elementId2)).lineHeight);
@@ -117 +142 @@
             pass = isCloseEnough(computedValue, expectedValue, tolerance);
     } else {
-        var computedStyle = window.getComputedStyle(document.getElementById(elementId)).getPropertyCSSValue(property);
+        var element;
+        if (iframeId)
+            element = document.getElementById(iframeId).contentDocument.getElementById(elementId);
+        else
+            element = document.getElementById(elementId);
+
+        var computedStyle = window.getComputedStyle(element).getPropertyCSSValue(property);
         computedValue = computedStyle.getFloatValue(CSSPrimitiveValue.CSS_NUMBER);
         if (compareElements) {
@@ -130 +161 @@
     if (compareElements) {
         if (pass)
-            result += "PASS - \"" + property + "\" property for \"" + elementId + "\" and \"" + elementId2 + "\" elements at " + time + "s are close enough to each other" + "<br>";
-        else
-            result += "FAIL - \"" + property + "\" property for \"" + elementId + "\" and \"" + elementId2 + "\" elements at " + time + "s saw: \"" + computedValue + "\" and \"" + computedValue2 + "\" which are not close enough to each other" + "<br>";
+            result += "PASS - \"" + property + "\" property for \"" + elementId + "\" and \"" + elementId2 + 
+                            "\" elements at " + time + "s are close enough to each other" + "<br>";
+        else
+            result += "FAIL - \"" + property + "\" property for \"" + elementId + "\" and \"" + elementId2 + 
+                            "\" elements at " + time + "s saw: \"" + computedValue + "\" and \"" + computedValue2 + 
+                                            "\" which are not close enough to each other" + "<br>";
     } else {
+        var elementName;
+        if (iframeId)
+            elementName = iframeId + '.' + elementId;
+        else
+            elementName = elementId;
         if (pass)
-            result += "PASS - \"" + property + "\" property for \"" + elementId + "\" element at " + time + "s saw something close to: " + expectedValue + "<br>";
-        else
-            result += "FAIL - \"" + property + "\" property for \"" + elementId + "\" element at " + time + "s expected: " + expectedValue + " but saw: " + computedValue + "<br>";
+            result += "PASS - \"" + property + "\" property for \"" + elementName + "\" element at " + time + 
+                            "s saw something close to: " + expectedValue + "<br>";
+        else
+            result += "FAIL - \"" + property + "\" property for \"" + elementName + "\" element at " + time + 
+                            "s expected: " + expectedValue + " but saw: " + computedValue + "<br>";
     }
 }

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-05  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Make suspendAnimations/resumeAnimations and setCSSAnimations traverse through subframes and remember state
+        https://bugs.webkit.org/show_bug.cgi?id=46945
+
+        Add new funtions to suspend and resume animations. The go through all subframes and suspend or resume them
+        recursively.
+
+        Test: animations/stop-animation-on-suspend.html
+
+        * WebCore.exp.in:
+        * page/Frame.cpp:
+        (WebCore::Frame::suspendAnimations):
+        (WebCore::Frame::resumeAnimations):
+        * page/Frame.h:
+
 2010-11-05  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/WebCore.exp.in

@@ -635 +635 @@
 __ZN7WebCore5Frame10createViewERKNS_7IntSizeERKNS_5ColorEbS3_bNS_13ScrollbarModeEbS7_b
 __ZN7WebCore5Frame14frameForWidgetEPKNS_6WidgetE
+__ZN7WebCore5Frame16resumeAnimationsEv
 __ZN7WebCore5Frame17setPageZoomFactorEf
 __ZN7WebCore5Frame17setTextZoomFactorEf
+__ZN7WebCore5Frame17suspendAnimationsEv
 __ZN7WebCore5Frame23visiblePositionForPointERKNS_8IntPointE
 __ZN7WebCore5Frame25matchLabelsAgainstElementEP7NSArrayPNS_7ElementE

trunk/WebCore/page/Frame.cpp

@@ -990 +990 @@
 }
 
+void Frame::suspendAnimations()
+{
+    animation()->suspendAnimations(document());
+    
+    // Handle subframes
+    for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
+        child->suspendAnimations();
+}
+
+void Frame::resumeAnimations()
+{
+    animation()->resumeAnimations(document());
+    
+    // Handle subframes
+    for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
+        child->resumeAnimations();
+}
+
 } // namespace WebCore

trunk/WebCore/page/Frame.h

@@ -99 +99 @@
         AnimationController* animation() const;
         ScriptController* script();
+        
+        void suspendAnimations();
+        void resumeAnimations();
 
         RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-11-05  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Make suspendAnimations/resumeAnimations and setCSSAnimations traverse through subframes and remember state
+        https://bugs.webkit.org/show_bug.cgi?id=46945
+
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_suspend_animations):
+        (webkit_web_frame_resume_animations):
+
 2010-11-03  Daniel Bates  <dbates@rim.com>
 

trunk/WebKit/gtk/webkit/webkitwebframe.cpp

@@ -1060 +1060 @@
         return;
 
-    AnimationController* controller = coreFrame->animation();
-    if (!controller)
+    frame->suspendAnimations();
+}
+
+void webkit_web_frame_resume_animations(WebKitWebFrame* frame)
+{
+    Frame* coreFrame = core(frame);
+    if (!coreFrame)
         return;
 
-    controller->suspendAnimations(coreFrame->document());
-}
-
-void webkit_web_frame_resume_animations(WebKitWebFrame* frame)
-{
-    Frame* coreFrame = core(frame);
-    if (!coreFrame)
-        return;
-
-    AnimationController* controller = coreFrame->animation();
-    if (!controller)
-        return;
-
-    controller->resumeAnimations(coreFrame->document());
+    frame->resumeAnimations();
 }
 

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-11-05  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Make suspendAnimations/resumeAnimations and setCSSAnimations traverse through subframes and remember state
+        https://bugs.webkit.org/show_bug.cgi?id=46945
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _suspendAnimations]):
+        (-[WebFrame _resumeAnimations]):
+
 2010-11-04  Jia Pu  <jpu@apple.com>
 

trunk/WebKit/mac/WebView/WebFrame.mm

@@ -1137 +1137 @@
     if (!frame)
         return;
-
-    AnimationController* controller = frame->animation();
-    if (!controller)
-        return;
-
-    controller->suspendAnimations(frame->document());
+        
+    frame->suspendAnimations();
 }
 
@@ -1151 +1147 @@
         return;
 
-    AnimationController* controller = frame->animation();
-    if (!controller)
-        return;
-
-    controller->resumeAnimations(frame->document());
+    frame->resumeAnimations();
 }
 

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-11-05  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Make suspendAnimations/resumeAnimations and setCSSAnimations traverse through subframes and remember state
+        https://bugs.webkit.org/show_bug.cgi?id=46945
+
+        * WebFrame.cpp:
+        (WebFrame::suspendAnimations):
+        (WebFrame::resumeAnimations):
+
 2010-11-05  Patrick Gansterer  <paroga@webkit.org>
 

trunk/WebKit/win/WebFrame.cpp

@@ -1300 +1300 @@
         return E_FAIL;
 
-    AnimationController* controller = frame->animation();
-    if (!controller)
-        return E_FAIL;
-
-    controller->suspendAnimations(frame->document());
+    frame->suspendAnimations();
     return S_OK;
 }
@@ -1314 +1310 @@
         return E_FAIL;
 
-    AnimationController* controller = frame->animation();
-    if (!controller)
-        return E_FAIL;
-
-    controller->resumeAnimations(frame->document());
+    frame->resumeAnimations();
     return S_OK;
 }