<!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>[162640] trunk/Source/WebCore</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/162640">162640</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-23 14:03:27 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't enable speculative tiles immediately after main load stops progressing
https://bugs.webkit.org/show_bug.cgi?id=127507
Reviewed by Andreas Kling.
It is common for timers and events to trigger more loading after the initial main frame loading
has completed. We should delay a bit before enabling speculative tiles and keep them disabled
if loading still continues.
* page/FrameView.cpp:
(WebCore::FrameView::FrameView):
(WebCore::FrameView::adjustTiledBackingCoverage):
(WebCore::shouldEnableSpeculativeTilingDuringLoading):
(WebCore::FrameView::enableSpeculativeTilingIfNeeded):
When load progression stops wait 0.5s before enabling speculative tiles.
(WebCore::FrameView::speculativeTilingEnableTimerFired):
Don't enable speculative tiles if the progression has started again. Instead restart the timer.
* page/FrameView.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::RenderLayerBacking):
(WebCore::computeTileCoverage):
Move the FrameView level code to FrameView (so we don't need to add a timer to every RenderLayerBacking).
* rendering/RenderLayerBacking.h:</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="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162639 => 162640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-23 22:01:23 UTC (rev 162639)
+++ trunk/Source/WebCore/ChangeLog 2014-01-23 22:03:27 UTC (rev 162640)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-01-23 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Don't enable speculative tiles immediately after main load stops progressing
+ https://bugs.webkit.org/show_bug.cgi?id=127507
+
+ Reviewed by Andreas Kling.
+
+ It is common for timers and events to trigger more loading after the initial main frame loading
+ has completed. We should delay a bit before enabling speculative tiles and keep them disabled
+ if loading still continues.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::FrameView):
+ (WebCore::FrameView::adjustTiledBackingCoverage):
+ (WebCore::shouldEnableSpeculativeTilingDuringLoading):
+ (WebCore::FrameView::enableSpeculativeTilingIfNeeded):
+
+ When load progression stops wait 0.5s before enabling speculative tiles.
+
+ (WebCore::FrameView::speculativeTilingEnableTimerFired):
+
+ Don't enable speculative tiles if the progression has started again. Instead restart the timer.
+
+ * page/FrameView.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::RenderLayerBacking):
+ (WebCore::computeTileCoverage):
+
+ Move the FrameView level code to FrameView (so we don't need to add a timer to every RenderLayerBacking).
+
+ * rendering/RenderLayerBacking.h:
+
+2014-01-23 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Loads started soon after main frame completion should be considered part of the main load
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127504
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (162639 => 162640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-01-23 22:01:23 UTC (rev 162639)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-01-23 22:03:27 UTC (rev 162640)
</span><span class="lines">@@ -204,6 +204,8 @@
</span><span class="cx"> , m_exposedRect(FloatRect::infiniteRect())
</span><span class="cx"> , m_deferSetNeedsLayouts(0)
</span><span class="cx"> , m_setNeedsLayoutWasDeferred(false)
</span><ins>+ , m_speculativeTilingEnabled(false)
+ , m_speculativeTilingEnableTimer(this, &FrameView::speculativeTilingEnableTimerFired)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_useCustomFixedPositionLayoutRect(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -2426,6 +2428,9 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::adjustTiledBackingCoverage()
</span><span class="cx"> {
</span><ins>+ if (!m_speculativeTilingEnabled)
+ enableSpeculativeTilingIfNeeded();
+
</ins><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (renderView && renderView->layer()->backing())
</span><span class="lines">@@ -2433,10 +2438,39 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (TileCache* tileCache = this->tileCache())
</span><del>- tileCache->setSpeculativeTileCreationEnabled(!m_frame->page()->progress().isMainLoadProgressing());
</del><ins>+ tileCache->setSpeculativeTileCreationEnabled(m_speculativeTilingEnabled);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldEnableSpeculativeTilingDuringLoading(const FrameView& view)
+{
+ return view.isVisuallyNonEmpty() && !view.frame().page()->progress().isMainLoadProgressing();
+}
+
+void FrameView::enableSpeculativeTilingIfNeeded()
+{
+ ASSERT(!m_speculativeTilingEnabled);
+ if (m_wasScrolledByUser) {
+ m_speculativeTilingEnabled = true;
+ return;
+ }
+ if (!shouldEnableSpeculativeTilingDuringLoading(*this))
+ return;
+ if (m_speculativeTilingEnableTimer.isActive())
+ return;
+ // Delay enabling a bit as load completion may trigger further loading from scripts.
+ static const double speculativeTilingEnableDelay = 0.5;
+ m_speculativeTilingEnableTimer.startOneShot(speculativeTilingEnableDelay);
+}
+
+void FrameView::speculativeTilingEnableTimerFired(Timer<FrameView>&)
+{
+ if (m_speculativeTilingEnabled)
+ return;
+ m_speculativeTilingEnabled = shouldEnableSpeculativeTilingDuringLoading(*this);
+ adjustTiledBackingCoverage();
+}
+
</ins><span class="cx"> void FrameView::layoutTimerFired(Timer<FrameView>&)
</span><span class="cx"> {
</span><span class="cx"> #ifdef INSTRUMENT_LAYOUT_SCHEDULING
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (162639 => 162640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-01-23 22:01:23 UTC (rev 162639)
+++ trunk/Source/WebCore/page/FrameView.h 2014-01-23 22:03:27 UTC (rev 162640)
</span><span class="lines">@@ -269,6 +269,7 @@
</span><span class="cx">
</span><span class="cx"> void updateLayerFlushThrottlingInAllFrames();
</span><span class="cx"> void adjustTiledBackingCoverage();
</span><ins>+ bool speculativeTilingEnabled() const { return m_speculativeTilingEnabled; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION)
</span><span class="cx"> void updateAnnotatedRegions();
</span><span class="lines">@@ -557,6 +558,9 @@
</span><span class="cx"> void updateDeferredRepaintDelayAfterRepaint();
</span><span class="cx"> double adjustedDeferredRepaintDelay() const;
</span><span class="cx">
</span><ins>+ void enableSpeculativeTilingIfNeeded();
+ void speculativeTilingEnableTimerFired(Timer<FrameView>&);
+
</ins><span class="cx"> bool updateEmbeddedObjects();
</span><span class="cx"> void updateEmbeddedObject(RenderEmbeddedObject&);
</span><span class="cx"> void scrollToAnchor();
</span><span class="lines">@@ -664,6 +668,9 @@
</span><span class="cx"> // Renderer to hold our custom scroll corner.
</span><span class="cx"> RenderPtr<RenderScrollbarPart> m_scrollCorner;
</span><span class="cx">
</span><ins>+ bool m_speculativeTilingEnabled;
+ Timer<FrameView> m_speculativeTilingEnableTimer;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_useCustomFixedPositionLayoutRect;
</span><span class="cx"> IntRect m_customFixedPositionLayoutRect;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (162639 => 162640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-23 22:01:23 UTC (rev 162639)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-23 22:03:27 UTC (rev 162640)
</span><span class="lines">@@ -123,7 +123,6 @@
</span><span class="cx"> , m_canCompositeFilters(false)
</span><span class="cx"> #endif
</span><span class="cx"> , m_backgroundLayerPaintsFixedRootBackground(false)
</span><del>- , m_didSwitchToFullTileCoverageDuringLoading(false)
</del><span class="cx"> {
</span><span class="cx"> Page* page = renderer().frame().page();
</span><span class="cx">
</span><span class="lines">@@ -220,14 +219,7 @@
</span><span class="cx">
</span><span class="cx"> TiledBacking::TileCoverage tileCoverage = TiledBacking::CoverageForVisibleArea;
</span><span class="cx"> bool useMinimalTilesDuringLiveResize = frameView.inLiveResize();
</span><del>- bool useMinimalTilesDuringLoading = false;
- // Avoid churn.
- if (!backing->didSwitchToFullTileCoverageDuringLoading()) {
- useMinimalTilesDuringLoading = !frameView.isVisuallyNonEmpty() || (frameView.frame().page()->progress().isMainLoadProgressing() && !frameView.wasScrolledByUser());
- if (!useMinimalTilesDuringLoading)
- backing->setDidSwitchToFullTileCoverageDuringLoading();
- }
- if (!(useMinimalTilesDuringLoading || useMinimalTilesDuringLiveResize)) {
</del><ins>+ if (frameView.speculativeTilingEnabled() && !useMinimalTilesDuringLiveResize) {
</ins><span class="cx"> bool clipsToExposedRect = !frameView.exposedRect().isInfinite();
</span><span class="cx"> if (frameView.horizontalScrollbarMode() != ScrollbarAlwaysOff || clipsToExposedRect)
</span><span class="cx"> tileCoverage |= TiledBacking::CoverageForHorizontalScrolling;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (162639 => 162640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-01-23 22:01:23 UTC (rev 162639)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-01-23 22:03:27 UTC (rev 162640)
</span><span class="lines">@@ -202,9 +202,6 @@
</span><span class="cx"> // Return an estimate of the backing store area (in pixels) allocated by this object's GraphicsLayers.
</span><span class="cx"> double backingStoreMemoryEstimate() const;
</span><span class="cx">
</span><del>- bool didSwitchToFullTileCoverageDuringLoading() const { return m_didSwitchToFullTileCoverageDuringLoading; }
- void setDidSwitchToFullTileCoverageDuringLoading() { m_didSwitchToFullTileCoverageDuringLoading = true; }
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void setBlendMode(BlendMode);
</span><span class="cx"> #endif
</span><span class="lines">@@ -324,7 +321,6 @@
</span><span class="cx"> bool m_canCompositeFilters;
</span><span class="cx"> #endif
</span><span class="cx"> bool m_backgroundLayerPaintsFixedRootBackground;
</span><del>- bool m_didSwitchToFullTileCoverageDuringLoading;
</del><span class="cx">
</span><span class="cx"> static bool m_creatingPrimaryGraphicsLayer;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>