Changeset 124336 in webkit

Timestamp:

Aug 1, 2012 8:45:28 AM (12 years ago)

Author:

zeno.albisser@nokia.com

Message:

[Qt]REGRESSION(r123786): It made 3 fast/animation tests fail.
​https://bugs.webkit.org/show_bug.cgi?id=92490

Source/WebKit/qt:

QAbstractAnimation:start() is implicitly calling updateTime
without going through the event loop. This resulted in executing
scripted animation callbacks right when registering a first callback.

Reviewed by Noam Rosenthal.

• WebCoreSupport/ChromeClientQt.cpp:

(WebCore::RefreshAnimation::scheduleAnimation):

Invoke QAbstractAnimation::start() method through the event loop.

Source/WebKit2:

Make sure that scripted animations are also serviced when
forceRepaint is being executed. As this is what is being used for
running layout tests.
Move servicing of scripted animations and layoutIfNeeded call
into a separate function syncDisplayState.
This function can then be called from forceRepaint as well as from
performScheduledLayerFlush.

Reviewed by Noam Rosenthal.

• WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:

(WebKit::LayerTreeCoordinator::forceRepaint):
(WebKit::LayerTreeCoordinator::performScheduledLayerFlush):
(WebKit):
(WebKit::LayerTreeCoordinator::syncDisplayState):

• WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h:

(LayerTreeCoordinator):

LayoutTests:

Reviewed by Noam Rosenthal.

• platform/qt/Skipped: Unskipping the tests listed below.

fast/animation/request-animation-frame-cancel2.html
fast/animation/request-animation-frame-detach-element.html
fast/animation/request-animation-frame-during-modal.html
fast/animation/request-animation-frame-timestamps.html
fast/dom/Window/post-message-crash.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp (modified) (3 diffs)
• Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-01  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt]REGRESSION(r123786): It made 3 fast/animation tests fail.
+        https://bugs.webkit.org/show_bug.cgi?id=92490
+
+        Reviewed by Noam Rosenthal.
+
+        * platform/qt/Skipped: Unskipping the tests listed below.
+            fast/animation/request-animation-frame-cancel2.html
+            fast/animation/request-animation-frame-detach-element.html
+            fast/animation/request-animation-frame-during-modal.html
+            fast/animation/request-animation-frame-timestamps.html
+            fast/dom/Window/post-message-crash.html
+
 2012-08-01  Keishi Hattori  <keishi@webkit.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -1969 +1969 @@
 fast/repaint/line-flow-with-floats-in-regions.html
 
-# [Qt]REGRESSION(r123786) It made 3 fast/animation tests fail
-# https://bugs.webkit.org/show_bug.cgi?id=92490
-fast/animation/request-animation-frame-cancel2.html
-fast/animation/request-animation-frame-detach-element.html
-fast/animation/request-animation-frame-during-modal.html
-fast/animation/request-animation-frame-timestamps.html
-fast/dom/Window/post-message-crash.html
-
 # [Qt] fast/block/positioning/offsetLeft-offsetTop-multicolumn.html is failing
 # https://bugs.webkit.org/show_bug.cgi?id=86130

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2012-08-01  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt]REGRESSION(r123786): It made 3 fast/animation tests fail.
+        https://bugs.webkit.org/show_bug.cgi?id=92490
+
+        QAbstractAnimation:start() is implicitly calling updateTime
+        without going through the event loop. This resulted in executing
+        scripted animation callbacks right when registering a first callback.
+
+        Reviewed by Noam Rosenthal.
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::RefreshAnimation::scheduleAnimation):
+            Invoke QAbstractAnimation::start() method through the event loop.
+
 2012-07-27  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -105 +105 @@
         m_animationScheduled = true;
         if (state() != QAbstractAnimation::Running)
-            start();
+            QMetaObject::invokeMethod(this, "start", Qt::QueuedConnection);
     }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-08-01  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt]REGRESSION(r123786): It made 3 fast/animation tests fail.
+        https://bugs.webkit.org/show_bug.cgi?id=92490
+
+        Make sure that scripted animations are also serviced when
+        forceRepaint is being executed. As this is what is being used for
+        running layout tests.
+        Move servicing of scripted animations and layoutIfNeeded call
+        into a separate function syncDisplayState.
+        This function can then be called from forceRepaint as well as from
+        performScheduledLayerFlush.
+
+        Reviewed by Noam Rosenthal.
+
+        * WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:
+        (WebKit::LayerTreeCoordinator::forceRepaint):
+        (WebKit::LayerTreeCoordinator::performScheduledLayerFlush):
+        (WebKit):
+        (WebKit::LayerTreeCoordinator::syncDisplayState):
+        * WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h:
+        (LayerTreeCoordinator):
+
 2012-08-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp

@@ -175 +175 @@
 void LayerTreeCoordinator::forceRepaint()
 {
+    // This is necessary for running layout tests. Since in this case we are not waiting for a UIProcess to reply nicely.
+    // Instead we are just triggering forceRepaint. But we still want to have the scripted animation callbacks being executed.
+    syncDisplayState();
+
     // We need to schedule another flush, otherwise the forced paint might cancel a later expected flush.
     // This is aligned with LayerTreeHostCA.
@@ -357 +361 @@
     if (m_isSuspended || m_waitingForUIProcess)
         return;
+
+    syncDisplayState();
+
+    if (!m_isValid)
+        return;
+
+    if (flushPendingLayerChanges())
+        didPerformScheduledLayerFlush();
+}
+
+void LayerTreeCoordinator::syncDisplayState()
+{
 #if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER) && !USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     // Make sure that any previously registered animation callbacks are being executed before we flush the layers.
@@ -363 +379 @@
 
     m_webPage->layoutIfNeeded();
-
-    if (!m_isValid)
-        return;
-
-    if (flushPendingLayerChanges())
-        didPerformScheduledLayerFlush();
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h

@@ -109 +109 @@
     void performScheduledLayerFlush();
     void didPerformScheduledLayerFlush();
+    void syncDisplayState();
 
     OwnPtr<WebCore::GraphicsLayer> m_rootLayer;