Changeset 183990 in webkit

Timestamp:

May 8, 2015, 2:44:28 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r183985.
​https://bugs.webkit.org/show_bug.cgi?id=144796

broke loader/go-back-to-different-window-size.html (Requested
by kling on #webkit).

Reverted changeset:

"Throttle RequestAnimationFrame in subframes that are outside
the viewport"
​https://bugs.webkit.org/show_bug.cgi?id=144718
​http://trac.webkit.org/changeset/183985

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/animation/request-animation-frame-throttle-subframe-display-none-expected.txt (deleted)
• LayoutTests/fast/animation/request-animation-frame-throttle-subframe-display-none.html (deleted)
• LayoutTests/fast/animation/request-animation-frame-throttle-subframe-expected.txt (deleted)
• LayoutTests/fast/animation/request-animation-frame-throttle-subframe.html (deleted)
• LayoutTests/fast/animation/resources (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.h (modified) (1 diff)
• Source/WebCore/dom/ScriptedAnimationController.cpp (modified) (3 diffs)
• Source/WebCore/dom/ScriptedAnimationController.h (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (5 diffs)
• Source/WebCore/page/FrameView.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183985.
+        https://bugs.webkit.org/show_bug.cgi?id=144796
+
+        broke loader/go-back-to-different-window-size.html (Requested
+        by kling on #webkit).
+
+        Reverted changeset:
+
+        "Throttle RequestAnimationFrame in subframes that are outside
+        the viewport"
+        https://bugs.webkit.org/show_bug.cgi?id=144718
+        http://trac.webkit.org/changeset/183985
+
 2015-05-08  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183985.
+        https://bugs.webkit.org/show_bug.cgi?id=144796
+
+        broke loader/go-back-to-different-window-size.html (Requested
+        by kling on #webkit).
+
+        Reverted changeset:
+
+        "Throttle RequestAnimationFrame in subframes that are outside
+        the viewport"
+        https://bugs.webkit.org/show_bug.cgi?id=144718
+        http://trac.webkit.org/changeset/183985
+
 2015-05-08  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/dom/Document.h

@@ -949 +949 @@
     virtual void postTask(Task) override final; // Executes the task on context's thread asynchronously.
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    ScriptedAnimationController* scriptedAnimationController() { return m_scriptedAnimationController.get(); }
-#endif
     void suspendScriptedAnimationControllerCallbacks();
     void resumeScriptedAnimationControllerCallbacks();

trunk/Source/WebCore/dom/ScriptedAnimationController.cpp

@@ -35 +35 @@
 #include "FrameView.h"
 #include "InspectorInstrumentation.h"
-#include "Logging.h"
-#include "MainFrame.h"
 #include "RequestAnimationFrameCallback.h"
 #include "Settings.h"
@@ -87 +85 @@
         return;
 
-    LOG(Animations, "%p - Setting RequestAnimationFrame throttling state to %d in frame %p (isMainFrame: %d)", this, isThrottled, m_document->frame(), m_document->frame() ? m_document->frame()->isMainFrame() : 0);
-
     m_isThrottled = isThrottled;
     if (m_animationTimer.isActive()) {
@@ -96 +92 @@
 #else
     UNUSED_PARAM(isThrottled);
-#endif
-}
-
-bool ScriptedAnimationController::isThrottled() const
-{
-#if USE(REQUEST_ANIMATION_FRAME_TIMER) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-    return m_isThrottled;
-#else
-    return false;
 #endif
 }

trunk/Source/WebCore/dom/ScriptedAnimationController.h

@@ -69 +69 @@
     void resume();
     void setThrottled(bool);
-    WEBCORE_EXPORT bool isThrottled() const;
 
     void windowScreenDidChange(PlatformDisplayID);

trunk/Source/WebCore/page/FrameView.cpp

@@ -81 +81 @@
 #include "SVGDocument.h"
 #include "SVGSVGElement.h"
-#include "ScriptedAnimationController.h"
 #include "ScrollAnimator.h"
 #include "ScrollingCoordinator.h"
@@ -1757 +1756 @@
 void FrameView::viewportContentsChanged()
 {
-    if (!frame().view()) {
-        // The frame is being destroyed.
-        return;
-    }
-
     // When the viewport contents changes (scroll, resize, style recalc, layout, ...),
     // check if we should resume animated images or unthrottle DOM timers.
-    applyRecursivelyWithVisibleRect([] (FrameView& frameView, const IntRect& visibleRect) {
-        frameView.resumeVisibleImageAnimations(visibleRect);
-        frameView.updateThrottledDOMTimersState(visibleRect);
-        frameView.updateScriptedAnimationsThrottlingState(visibleRect);
-    });
+    resumeVisibleImageAnimationsIncludingSubframes();
+    updateThrottledDOMTimersState();
 }
 
@@ -2105 +2096 @@
 }
 
-void FrameView::applyRecursivelyWithVisibleRect(const std::function<void (FrameView& frameView, const IntRect& visibleRect)>& apply)
-{
+void FrameView::resumeVisibleImageAnimationsIncludingSubframes()
+{
+    auto* renderView = frame().contentRenderer();
+    if (!renderView)
+        return;
+
     IntRect windowClipRect = this->windowClipRect();
     auto visibleRect = windowToContents(windowClipRect);
-    apply(*this, visibleRect);
+    if (visibleRect.isEmpty())
+        return;
+
+    // Resume paused image animations in this frame.
+    renderView->resumePausedImageAnimationsIfNeeded(visibleRect);
 
     // Recursive call for subframes. We cache the current FrameView's windowClipRect to avoid recomputing it for every subframe.
@@ -2115 +2114 @@
     for (Frame* childFrame = frame().tree().firstChild(); childFrame; childFrame = childFrame->tree().nextSibling()) {
         if (auto* childView = childFrame->view())
-            childView->applyRecursivelyWithVisibleRect(apply);
-    }
-}
-
-void FrameView::resumeVisibleImageAnimations(const IntRect& visibleRect)
-{
-    if (visibleRect.isEmpty())
-        return;
-
-    if (auto* renderView = frame().contentRenderer())
-        renderView->resumePausedImageAnimationsIfNeeded(visibleRect);
-}
-
-void FrameView::updateScriptedAnimationsThrottlingState(const IntRect& visibleRect)
-{
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    if (frame().isMainFrame())
-        return;
-
-    auto* document = frame().document();
-    if (!document)
-        return;
-
-    auto* scriptedAnimationController = document->scriptedAnimationController();
-    if (!scriptedAnimationController)
-        return;
-
-    // FIXME: This doesn't work for subframes of a "display: none" frame because
-    // they have a non-null ownerRenderer.
-    bool shouldThrottle = !frame().ownerRenderer() || visibleRect.isEmpty();
-    scriptedAnimationController->setThrottled(shouldThrottle);
-#else
-    UNUSED_PARAM(visibleRect);
-#endif
-}
-
-
-void FrameView::resumeVisibleImageAnimationsIncludingSubframes()
-{
-    applyRecursivelyWithVisibleRect([] (FrameView& frameView, const IntRect& visibleRect) {
-        frameView.resumeVisibleImageAnimations(visibleRect);
-    });
+            childView->resumeVisibleImageAnimationsIncludingSubframes();
+    }
 }
 
@@ -3101 +3060 @@
 }
 
-void FrameView::updateThrottledDOMTimersState(const IntRect& visibleRect)
+void FrameView::updateThrottledDOMTimersState()
 {
     if (m_throttledTimers.isEmpty())
         return;
+
+    IntRect visibleRect = windowToContents(windowClipRect());
 
     // Do not iterate over the HashSet because calling DOMTimer::updateThrottlingStateAfterViewportChange()

trunk/Source/WebCore/page/FrameView.h

@@ -597 +597 @@
     void performPostLayoutTasks();
     void autoSizeIfEnabled();
-
-    void applyRecursivelyWithVisibleRect(const std::function<void (FrameView& frameView, const IntRect& visibleRect)>&);
-    void updateThrottledDOMTimersState(const IntRect& visibleRect);
-    void resumeVisibleImageAnimations(const IntRect& visibleRect);
-    void updateScriptedAnimationsThrottlingState(const IntRect& visibleRect);
+    void updateThrottledDOMTimersState();
 
     void updateLayerFlushThrottling();

trunk/Source/WebCore/testing/Internals.cpp

@@ -99 +99 @@
 #include "RuntimeEnabledFeatures.h"
 #include "SchemeRegistry.h"
-#include "ScriptedAnimationController.h"
 #include "ScrollingCoordinator.h"
 #include "SerializedScriptValue.h"
@@ -766 +765 @@
     }
     return timer->m_throttleState == DOMTimer::ShouldThrottle;
-}
-
-bool Internals::isRequestAnimationFrameThrottled() const
-{
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    auto* scriptedAnimationController = contextDocument()->scriptedAnimationController();
-    if (!scriptedAnimationController)
-        return false;
-    return scriptedAnimationController->isThrottled();
-#else
-    return false;
-#endif
 }
 

trunk/Source/WebCore/testing/Internals.h

@@ -114 +114 @@
     // DOMTimers throttling testing.
     bool isTimerThrottled(int timeoutId, ExceptionCode&);
-    bool isRequestAnimationFrameThrottled() const;
 
     // Spatial Navigation testing.

trunk/Source/WebCore/testing/Internals.idl

@@ -280 +280 @@
     [RaisesException] boolean isTimerThrottled(long timerHandle);
 
-    boolean isRequestAnimationFrameThrottled();
-
     [RaisesException] void startTrackingStyleRecalcs();
     [RaisesException] unsigned long styleRecalcCount();