<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170830] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170830">170830</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-07-06 13:05:03 -0700 (Sun, 06 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageLayerFlushThrottleStateh">trunk/Source/WebCore/page/LayerFlushThrottleState.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170829 => 170830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-06 18:03:06 UTC (rev 170829)
+++ trunk/Source/WebCore/ChangeLog 2014-07-06 20:05:03 UTC (rev 170830)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-07-06 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Inline NodeListsNodeData helpers more aggressively.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (170829 => 170830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-07-06 18:03:06 UTC (rev 170829)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-07-06 20:05:03 UTC (rev 170830)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #include "HTMLFrameSetElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLPlugInImageElement.h"
</span><ins>+#include "ImageDocument.h"
</ins><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -2251,12 +2252,26 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void FrameView::disableLayerFlushThrottlingTemporarilyForInteraction()
</span><span class="cx"> {
</span><del>- bool mainLoadProgressing = frame().page()->progress().isMainLoadProgressing();
</del><ins>+ if (!frame().page())
+ return;
+ auto& page = *frame().page();
</ins><span class="cx">
</span><del>- LayerFlushThrottleState::Flags flags = LayerFlushThrottleState::UserIsInteracting | (mainLoadProgressing ? LayerFlushThrottleState::MainLoadProgressing : 0);
- if (frame().page()->chrome().client().adjustLayerFlushThrottling(flags))
</del><ins>+ LayerFlushThrottleState::Flags flags = LayerFlushThrottleState::UserIsInteracting | determineLayerFlushThrottleState(page);
+ if (page.chrome().client().adjustLayerFlushThrottling(flags))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (RenderView* view = renderView())
</span><span class="lines">@@ -2272,17 +2287,17 @@
</span><span class="cx"> void FrameView::updateLayerFlushThrottling()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(frame().isMainFrame());
</span><ins>+ auto& page = *frame().page();
</ins><span class="cx">
</span><del>- bool isMainLoadProgressing = frame().page()->progress().isMainLoadProgressing();
</del><ins>+ LayerFlushThrottleState::Flags flags = determineLayerFlushThrottleState(page);
</ins><span class="cx">
</span><span class="cx"> // See if the client is handling throttling.
</span><del>- LayerFlushThrottleState::Flags flags = isMainLoadProgressing ? LayerFlushThrottleState::MainLoadProgressing : 0;
- if (frame().page()->chrome().client().adjustLayerFlushThrottling(flags))
</del><ins>+ if (page.chrome().client().adjustLayerFlushThrottling(flags))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
</span><span class="cx"> if (RenderView* renderView = frame->contentRenderer())
</span><del>- renderView->compositor().setLayerFlushThrottlingEnabled(isMainLoadProgressing);
</del><ins>+ renderView->compositor().setLayerFlushThrottlingEnabled(flags & LayerFlushThrottleState::Enabled);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageLayerFlushThrottleStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/LayerFlushThrottleState.h (170829 => 170830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/LayerFlushThrottleState.h 2014-07-06 18:03:06 UTC (rev 170829)
+++ trunk/Source/WebCore/page/LayerFlushThrottleState.h 2014-07-06 20:05:03 UTC (rev 170830)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> struct LayerFlushThrottleState {
</span><span class="cx"> enum {
</span><del>- MainLoadProgressing = 1 << 0,
</del><ins>+ Enabled = 1 << 0,
</ins><span class="cx"> UserIsInteracting = 1 << 1
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned Flags;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170829 => 170830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-06 18:03:06 UTC (rev 170829)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-06 20:05:03 UTC (rev 170830)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-07-04 Rohit Kumar <kumar.rohit@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2]Fix build break in EFL WK2
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (170829 => 170830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-07-06 18:03:06 UTC (rev 170829)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-07-06 20:05:03 UTC (rev 170830)
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> m_isLayerFlushThrottlingTemporarilyDisabledForInteraction = true;
</span><span class="cx">
</span><span class="cx"> bool wasThrottlingLayerFlushes = m_isThrottlingLayerFlushes;
</span><del>- m_isThrottlingLayerFlushes = flags & WebCore::LayerFlushThrottleState::MainLoadProgressing;
</del><ins>+ m_isThrottlingLayerFlushes = flags & WebCore::LayerFlushThrottleState::Enabled;
</ins><span class="cx">
</span><span class="cx"> if (!wasThrottlingLayerFlushes && m_isThrottlingLayerFlushes)
</span><span class="cx"> m_isInitialThrottledLayerFlush = true;
</span></span></pre>
</div>
</div>
</body>
</html>