<!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>[165534] 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/165534">165534</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-03-13 08:41:42 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that layout milestones complete in all cases
https://bugs.webkit.org/show_bug.cgi?id=130101
Reviewed by Darin Adler.
Milestones fail to complete in some testing scenarios.
* dom/Document.cpp:
(WebCore::Document::setParsing):
Check if we need to fire layout milestones if parsing finishes without pending layout.
Parsing status affects whether the document is considered non-empty and that affects
layout milestones.
Remove explicit layout scheduling here, layout timer will be active already if there
is a layout pending
* page/FrameView.cpp:
(WebCore::FrameView::performPostLayoutTasks):
(WebCore::FrameView::firePaintRelatedMilestonesIfNeeded):
Renamed for consistency
(WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
Factor layout milestone firing into a function.
* page/FrameView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</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="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165533 => 165534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-13 07:55:06 UTC (rev 165533)
+++ trunk/Source/WebCore/ChangeLog 2014-03-13 15:41:42 UTC (rev 165534)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-03-13 Antti Koivisto <antti@apple.com>
+
+ Ensure that layout milestones complete in all cases
+ https://bugs.webkit.org/show_bug.cgi?id=130101
+
+ Reviewed by Darin Adler.
+
+ Milestones fail to complete in some testing scenarios.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setParsing):
+
+ Check if we need to fire layout milestones if parsing finishes without pending layout.
+ Parsing status affects whether the document is considered non-empty and that affects
+ layout milestones.
+
+ Remove explicit layout scheduling here, layout timer will be active already if there
+ is a layout pending
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::performPostLayoutTasks):
+ (WebCore::FrameView::firePaintRelatedMilestonesIfNeeded):
+
+ Renamed for consistency
+
+ (WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
+
+ Factor layout milestone firing into a function.
+
+ * page/FrameView.h:
+
</ins><span class="cx"> 2014-03-12 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Replay: add infrastructure for memoizing nondeterministic DOM APIs
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (165533 => 165534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-03-13 07:55:06 UTC (rev 165533)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-03-13 15:41:42 UTC (rev 165534)
</span><span class="lines">@@ -2486,8 +2486,8 @@
</span><span class="cx"> if (m_bParsing && !m_sharedObjectPool)
</span><span class="cx"> m_sharedObjectPool = std::make_unique<DocumentSharedObjectPool>();
</span><span class="cx">
</span><del>- if (!m_bParsing && view())
- view()->scheduleRelayout();
</del><ins>+ if (!m_bParsing && view() && !view()->needsLayout())
+ view()->fireLayoutRelatedMilestonesIfNeeded();
</ins><span class="cx">
</span><span class="cx"> #ifdef INSTRUMENT_LAYOUT_SCHEDULING
</span><span class="cx"> if (!ownerElement() && !m_bParsing)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (165533 => 165534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-03-13 07:55:06 UTC (rev 165533)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-03-13 15:41:42 UTC (rev 165534)
</span><span class="lines">@@ -2635,31 +2635,9 @@
</span><span class="cx"> frame().selection().setCaretRectNeedsUpdate();
</span><span class="cx"> frame().selection().updateAndRevealSelection();
</span><span class="cx">
</span><del>- LayoutMilestones requestedMilestones = 0;
- LayoutMilestones milestonesAchieved = 0;
- Page* page = frame().page();
- if (page)
- requestedMilestones = page->requestedLayoutMilestones();
</del><ins>+ if (m_nestedLayoutCount <= 1 && frame().document()->documentElement())
+ fireLayoutRelatedMilestonesIfNeeded();
</ins><span class="cx">
</span><del>- if (m_nestedLayoutCount <= 1 && frame().document()->documentElement()) {
- if (m_firstLayoutCallbackPending) {
- m_firstLayoutCallbackPending = false;
- frame().loader().didFirstLayout();
- if (requestedMilestones & DidFirstLayout)
- milestonesAchieved |= DidFirstLayout;
- if (frame().isMainFrame())
- page->startCountingRelevantRepaintedObjects();
- }
- updateIsVisuallyNonEmpty();
-
- // If the layout was done with pending sheets, we are not in fact visually non-empty yet.
- if (m_isVisuallyNonEmpty && !frame().document()->didLayoutWithPendingStylesheets() && m_firstVisuallyNonEmptyLayoutCallbackPending) {
- m_firstVisuallyNonEmptyLayoutCallbackPending = false;
- if (requestedMilestones & DidFirstVisuallyNonEmptyLayout)
- milestonesAchieved |= DidFirstVisuallyNonEmptyLayout;
- }
- }
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Only send layout-related delegate callbacks synchronously for the main frame to
</span><span class="cx"> // avoid re-entering layout for the main frame while delivering a layout-related delegate
</span><span class="lines">@@ -2668,9 +2646,6 @@
</span><span class="cx"> page->chrome().client().didLayout();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (milestonesAchieved && frame().isMainFrame())
- frame().loader().didLayout(milestonesAchieved);
-
</del><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().fontLoadEventsEnabled())
</span><span class="cx"> frame().document()->fontloader()->didLayout();
</span><span class="lines">@@ -2691,8 +2666,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (page) {
- if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</del><ins>+ if (auto* page = frame().page()) {
+ if (auto* scrollingCoordinator = page->scrollingCoordinator())
</ins><span class="cx"> scrollingCoordinator->frameViewLayoutUpdated(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3556,7 +3531,7 @@
</span><span class="cx"> if (!p->paintingDisabled()) {
</span><span class="cx"> InspectorInstrumentation::didPaint(renderView, p, rect);
</span><span class="cx"> // FIXME: should probably not fire milestones for snapshot painting. https://bugs.webkit.org/show_bug.cgi?id=117623
</span><del>- firePaintRelatedMilestones();
</del><ins>+ firePaintRelatedMilestonesIfNeeded();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4147,9 +4122,38 @@
</span><span class="cx"> m_milestonesPendingPaint |= milestones;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::firePaintRelatedMilestones()
</del><ins>+void FrameView::fireLayoutRelatedMilestonesIfNeeded()
</ins><span class="cx"> {
</span><ins>+ LayoutMilestones requestedMilestones = 0;
+ LayoutMilestones milestonesAchieved = 0;
</ins><span class="cx"> Page* page = frame().page();
</span><ins>+ if (page)
+ requestedMilestones = page->requestedLayoutMilestones();
+
+ if (m_firstLayoutCallbackPending) {
+ m_firstLayoutCallbackPending = false;
+ frame().loader().didFirstLayout();
+ if (requestedMilestones & DidFirstLayout)
+ milestonesAchieved |= DidFirstLayout;
+ if (frame().isMainFrame())
+ page->startCountingRelevantRepaintedObjects();
+ }
+ updateIsVisuallyNonEmpty();
+
+ // If the layout was done with pending sheets, we are not in fact visually non-empty yet.
+ if (m_isVisuallyNonEmpty && !frame().document()->didLayoutWithPendingStylesheets() && m_firstVisuallyNonEmptyLayoutCallbackPending) {
+ m_firstVisuallyNonEmptyLayoutCallbackPending = false;
+ if (requestedMilestones & DidFirstVisuallyNonEmptyLayout)
+ milestonesAchieved |= DidFirstVisuallyNonEmptyLayout;
+ }
+
+ if (milestonesAchieved && frame().isMainFrame())
+ frame().loader().didLayout(milestonesAchieved);
+}
+
+void FrameView::firePaintRelatedMilestonesIfNeeded()
+{
+ Page* page = frame().page();
</ins><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (165533 => 165534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-03-13 07:55:06 UTC (rev 165533)
+++ trunk/Source/WebCore/page/FrameView.h 2014-03-13 15:41:42 UTC (rev 165534)
</span><span class="lines">@@ -431,7 +431,8 @@
</span><span class="cx"> virtual void willEndLiveResize() override;
</span><span class="cx">
</span><span class="cx"> void addPaintPendingMilestones(LayoutMilestones);
</span><del>- void firePaintRelatedMilestones();
</del><ins>+ void firePaintRelatedMilestonesIfNeeded();
+ void fireLayoutRelatedMilestonesIfNeeded();
</ins><span class="cx"> LayoutMilestones milestonesPendingPaint() const { return m_milestonesPendingPaint; }
</span><span class="cx">
</span><span class="cx"> bool visualUpdatesAllowedByClient() const { return m_visualUpdatesAllowedByClient; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (165533 => 165534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-03-13 07:55:06 UTC (rev 165533)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-03-13 15:41:42 UTC (rev 165534)
</span><span class="lines">@@ -3755,7 +3755,7 @@
</span><span class="cx"> if (page->chrome().client().layerTreeStateIsFrozen())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_renderView.frameView().firePaintRelatedMilestones();
</del><ins>+ m_renderView.frameView().firePaintRelatedMilestonesIfNeeded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>