Changeset 215070 in webkit

Timestamp:

Apr 6, 2017, 5:04:10 PM (8 years ago)

Author:

Simon Fraser

Message:

Throttle requestAnimationFrame in cross-origin iframes to 30fps
​https://bugs.webkit.org/show_bug.cgi?id=170534

Reviewed by Dan Bates.

Source/WebCore:

Add a throttling reason to ScriptedAnimationController which is NonInteractedCrossOriginFrame,
set on cross-origin iframes whose documents have never seen a user interaction. It's cleared
as soon as an interaction on this frame or a child frame is detected.

Move the initialization of the LowPowerMode throttling reason to Document::requestAnimationFrame(),
since it's more appropriate to compute NonInteractedCrossOriginFrame here than down in ScriptedAnimationController,
and best to do both in the same place.

Tests: http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe.html

• dom/Document.cpp:

(WebCore::Document::requestAnimationFrame):
(WebCore::Document::updateLastHandledUserGestureTimestamp):

• dom/Document.h:

(WebCore::Document::hasHadUserInteraction):

• dom/ScriptedAnimationController.cpp:

(WebCore::ScriptedAnimationController::ScriptedAnimationController):
(WebCore::throttlingReasonToString):
(WebCore::ScriptedAnimationController::interval):

• dom/ScriptedAnimationController.h:
• loader/FrameLoader.cpp:

(WebCore::shouldAskForNavigationConfirmation):

LayoutTests:

• http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe-expected.txt: Added.
• http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe.html: Added.
• http/tests/frame-throttling/resources/requestAnimationFrame-frame.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/frame-throttling (added)
• LayoutTests/http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe-expected.txt (added)
• LayoutTests/http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe.html (added)
• LayoutTests/http/tests/frame-throttling/resources (added)
• LayoutTests/http/tests/frame-throttling/resources/requestAnimationFrame-frame.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• 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/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-04-05  Simon Fraser  <simon.fraser@apple.com>
+
+        Throttle requestAnimationFrame in cross-origin iframes to 30fps
+        https://bugs.webkit.org/show_bug.cgi?id=170534
+
+        Reviewed by Dan Bates.
+
+        * http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe-expected.txt: Added.
+        * http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe.html: Added.
+        * http/tests/frame-throttling/resources/requestAnimationFrame-frame.html: Added.
+
 2017-04-06  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-05  Simon Fraser  <simon.fraser@apple.com>
+
+        Throttle requestAnimationFrame in cross-origin iframes to 30fps
+        https://bugs.webkit.org/show_bug.cgi?id=170534
+
+        Reviewed by Dan Bates.
+
+        Add a throttling reason to ScriptedAnimationController which is NonInteractedCrossOriginFrame,
+        set on cross-origin iframes whose documents have never seen a user interaction. It's cleared
+        as soon as an interaction on this frame or a child frame is detected.
+
+        Move the initialization of the LowPowerMode throttling reason to Document::requestAnimationFrame(),
+        since it's more appropriate to compute NonInteractedCrossOriginFrame here than down in ScriptedAnimationController,
+        and best to do both in the same place.
+
+        Tests: http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::requestAnimationFrame):
+        (WebCore::Document::updateLastHandledUserGestureTimestamp):
+        * dom/Document.h:
+        (WebCore::Document::hasHadUserInteraction):
+        * dom/ScriptedAnimationController.cpp:
+        (WebCore::ScriptedAnimationController::ScriptedAnimationController):
+        (WebCore::throttlingReasonToString):
+        (WebCore::ScriptedAnimationController::interval):
+        * dom/ScriptedAnimationController.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::shouldAskForNavigationConfirmation):
+
 2017-04-05  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -6012 +6012 @@
             m_scriptedAnimationController->suspend();
 
+        if (page() && page()->isLowPowerModeEnabled())
+            m_scriptedAnimationController->addThrottlingReason(ScriptedAnimationController::ThrottlingReason::LowPowerMode);
+
+        if (!topOrigin().canAccess(securityOrigin()) && !hasHadUserInteraction())
+            m_scriptedAnimationController->addThrottlingReason(ScriptedAnimationController::ThrottlingReason::NonInteractedCrossOriginFrame);
+
         if (settings().shouldDispatchRequestAnimationFrameEvents()) {
             if (!page())
@@ -6316 +6322 @@
 {
     m_lastHandledUserGestureTimestamp = time;
+
+    if (static_cast<bool>(time) && m_scriptedAnimationController) {
+        // It's OK to always remove NonInteractedCrossOriginFrame even if this frame isn't cross-origin.
+        m_scriptedAnimationController->removeThrottlingReason(ScriptedAnimationController::ThrottlingReason::NonInteractedCrossOriginFrame);
+    }
     
     if (HTMLFrameOwnerElement* element = ownerElement())

trunk/Source/WebCore/dom/Document.h

@@ -1145 +1145 @@
 
     MonotonicTime lastHandledUserGestureTimestamp() const { return m_lastHandledUserGestureTimestamp; }
+    bool hasHadUserInteraction() const { return static_cast<bool>(m_lastHandledUserGestureTimestamp); }
     void updateLastHandledUserGestureTimestamp(MonotonicTime);
 

trunk/Source/WebCore/dom/ScriptedAnimationController.cpp

@@ -65 +65 @@
 {
     windowScreenDidChange(displayID);
-
-    auto* page = document.page();
-    if (page && page->isLowPowerModeEnabled())
-        addThrottlingReason(ThrottlingReason::LowPowerMode);
 }
 
@@ -111 +107 @@
     case ScriptedAnimationController::ThrottlingReason::LowPowerMode:
         return "LowPowerMode";
+    case ScriptedAnimationController::ThrottlingReason::NonInteractedCrossOriginFrame:
+        return "NonInteractiveCrossOriginFrame";
     }
 }
@@ -269 +267 @@
     if (m_throttlingReasons.contains(ThrottlingReason::VisuallyIdle) || m_throttlingReasons.contains(ThrottlingReason::OutsideViewport))
         return aggressiveThrottlingAnimationInterval;
+
     if (m_throttlingReasons.contains(ThrottlingReason::LowPowerMode))
         return halfSpeedThrottlingAnimationInterval;
+
+    if (m_throttlingReasons.contains(ThrottlingReason::NonInteractedCrossOriginFrame))
+        return halfSpeedThrottlingAnimationInterval;
+
     ASSERT(m_throttlingReasons.isEmpty());
 #endif

trunk/Source/WebCore/dom/ScriptedAnimationController.h

@@ -74 +74 @@
 
     enum class ThrottlingReason {
-        VisuallyIdle    = 1 << 0,
-        OutsideViewport = 1 << 1,
-        LowPowerMode    = 1 << 2,
+        VisuallyIdle                    = 1 << 0,
+        OutsideViewport                 = 1 << 1,
+        LowPowerMode                    = 1 << 2,
+        NonInteractedCrossOriginFrame   = 1 << 3,
     };
     void addThrottlingReason(ThrottlingReason);

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -3037 +3037 @@
 static bool shouldAskForNavigationConfirmation(Document& document, const BeforeUnloadEvent& event)
 {
-    bool userDidInteractWithPage = static_cast<bool>(document.topDocument().lastHandledUserGestureTimestamp());
+    bool userDidInteractWithPage = document.topDocument().hasHadUserInteraction();
     // Web pages can request we ask for confirmation before navigating by:
     // - Cancelling the BeforeUnloadEvent (modern way)