Changeset 170830 in webkit

Timestamp:

Jul 6, 2014 1:05:03 PM (10 years ago)

Author:

Antti Koivisto

Message:

Don't throttle layer flushes when the main resource is a GIF
​https://bugs.webkit.org/show_bug.cgi?id=134650

Source/WebCore:
<rdar://problem/17490712>

Reviewed by Simon Fraser.

Avoid throttling big image animations.

• page/FrameView.cpp:

(WebCore::determineLayerFlushThrottleState):

Disable for image documents.

(WebCore::FrameView::disableLayerFlushThrottlingTemporarilyForInteraction):
(WebCore::FrameView::updateLayerFlushThrottling):

Refactor a bit.

• page/LayerFlushThrottleState.h:

Rename the flag.

Source/WebKit2:

Reviewed by Simon Fraser.

• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::adjustLayerFlushThrottling):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (3 diffs)
• WebCore/page/LayerFlushThrottleState.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-06  Antti Koivisto  <antti@apple.com>
+
+        Don't throttle layer flushes when the main resource is a GIF
+        https://bugs.webkit.org/show_bug.cgi?id=134650
+        <rdar://problem/17490712>
+
+        Reviewed by Simon Fraser.
+        
+        Avoid throttling big image animations.
+
+        * page/FrameView.cpp:
+        (WebCore::determineLayerFlushThrottleState):
+        
+            Disable for image documents.
+
+        (WebCore::FrameView::disableLayerFlushThrottlingTemporarilyForInteraction):
+        (WebCore::FrameView::updateLayerFlushThrottling):
+        
+            Refactor a bit.
+
+        * page/LayerFlushThrottleState.h:
+        
+            Rename the flag.
+
 2014-07-06  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -52 +52 @@
 #include "HTMLNames.h"
 #include "HTMLPlugInImageElement.h"
+#include "ImageDocument.h"
 #include "InspectorClient.h"
 #include "InspectorController.h"
@@ -2252 +2253 @@
 }
 
+static LayerFlushThrottleState::Flags determineLayerFlushThrottleState(Page& page)
+{
+    // We only throttle when constantly receiving new data during the inital page load.
+    if (!page.progress().isMainLoadProgressing())
+        return 0;
+    // Disable for image documents so large GIF animations don't get throttled during loading.
+    auto* document = page.mainFrame().document();
+    if (!document || isImageDocument(*document))
+        return 0;
+    return LayerFlushThrottleState::Enabled;
+}
+
 void FrameView::disableLayerFlushThrottlingTemporarilyForInteraction()
 {
-    bool mainLoadProgressing = frame().page()->progress().isMainLoadProgressing();
-
-    LayerFlushThrottleState::Flags flags = LayerFlushThrottleState::UserIsInteracting | (mainLoadProgressing ? LayerFlushThrottleState::MainLoadProgressing : 0);
-    if (frame().page()->chrome().client().adjustLayerFlushThrottling(flags))
+    if (!frame().page())
+        return;
+    auto& page = *frame().page();
+
+    LayerFlushThrottleState::Flags flags = LayerFlushThrottleState::UserIsInteracting | determineLayerFlushThrottleState(page);
+    if (page.chrome().client().adjustLayerFlushThrottling(flags))
         return;
 
@@ -2273 +2288 @@
 {
     ASSERT(frame().isMainFrame());
-
-    bool isMainLoadProgressing = frame().page()->progress().isMainLoadProgressing();
+    auto& page = *frame().page();
+
+    LayerFlushThrottleState::Flags flags = determineLayerFlushThrottleState(page);
 
     // See if the client is handling throttling.
-    LayerFlushThrottleState::Flags flags = isMainLoadProgressing ? LayerFlushThrottleState::MainLoadProgressing : 0;
-    if (frame().page()->chrome().client().adjustLayerFlushThrottling(flags))
+    if (page.chrome().client().adjustLayerFlushThrottling(flags))
         return;
 
     for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         if (RenderView* renderView = frame->contentRenderer())
-            renderView->compositor().setLayerFlushThrottlingEnabled(isMainLoadProgressing);
+            renderView->compositor().setLayerFlushThrottlingEnabled(flags & LayerFlushThrottleState::Enabled);
     }
 }

trunk/Source/WebCore/page/LayerFlushThrottleState.h

@@ -31 +31 @@
 struct LayerFlushThrottleState {
     enum {
-        MainLoadProgressing = 1 << 0,
+        Enabled = 1 << 0,
         UserIsInteracting = 1 << 1
     };

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-06  Antti Koivisto  <antti@apple.com>
+
+        Don't throttle layer flushes when the main resource is a GIF
+        https://bugs.webkit.org/show_bug.cgi?id=134650
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::adjustLayerFlushThrottling):
+
 2014-07-04  Rohit Kumar  <kumar.rohit@samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

@@ -275 +275 @@
 
     bool wasThrottlingLayerFlushes = m_isThrottlingLayerFlushes;
-    m_isThrottlingLayerFlushes = flags & WebCore::LayerFlushThrottleState::MainLoadProgressing;
+    m_isThrottlingLayerFlushes = flags & WebCore::LayerFlushThrottleState::Enabled;
 
     if (!wasThrottlingLayerFlushes && m_isThrottlingLayerFlushes)