<!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>[179073] branches/safari-600.1.4.15-branch/Source/WebKit2</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/179073">179073</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-01-24 12:36:59 -0800 (Sat, 24 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176382">r176382</a>. rdar://problem/19419810</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebCoreSupportWebProgressTrackerClientcpp">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebProgressTrackerClient.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179072 => 179073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-24 20:30:35 UTC (rev 179072)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-24 20:36:59 UTC (rev 179073)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-01-24 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176382.
+
+ 2014-11-19 Yongjun Zhang <yongjun_zhang@apple.com>
+
+ Don't track sub-resources that are started after main frame progress has completed.
+ https://bugs.webkit.org/show_bug.cgi?id=138582
+
+ Reviewed by Sam Weinig.
+
+ After main frame progress has finished, starting loading a sub-resource shouldn't affect
+ UI process's view of page loading status (i.e., the page has already completed loading
+ and the progress shouldn't change). To achive that, don't track the subresources that
+ are started after the main frame has finished, except for those triggered by user interaction.
+
+ * WebProcess/WebCoreSupport/WebProgressTrackerClient.cpp: Notify WebPage that the main frame progress
+ has started or finished.
+ (WebKit::WebProgressTrackerClient::progressStarted):
+ (WebKit::WebProgressTrackerClient::progressFinished):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::addResourceRequest): Don't track the resource request if it is initiated after
+ the main frame is loaded and it is not triggered by user interaction.
+ (WebKit::WebPage::removeResourceRequest):
+ * WebProcess/WebPage/WebPage.h: Rename m_networkResourceRequestIdentifiers to m_trackedNetworkResourceRequestIdentifiers.
+ (WebKit::WebPage::setMainFrameProgressCompleted):
+
+2015-01-24 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> <rdar://problem/19433134> REGRESSION (iOS 8): Reproducible null deref in WebKit::nextFocusableElement
</span><span class="cx">
</span><span class="cx"> Merged small change from r175549.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebCoreSupportWebProgressTrackerClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebProgressTrackerClient.cpp (179072 => 179073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebProgressTrackerClient.cpp 2015-01-24 20:30:35 UTC (rev 179072)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebProgressTrackerClient.cpp 2015-01-24 20:36:59 UTC (rev 179073)
</span><span class="lines">@@ -51,7 +51,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!originatingProgressFrame.isMainFrame())
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ m_webPage.setMainFrameProgressCompleted(false);
</ins><span class="cx"> m_webPage.send(Messages::WebPageProxy::DidStartProgress());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -68,10 +69,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (!originatingProgressFrame.isMainFrame())
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ m_webPage.setMainFrameProgressCompleted(true);
+
</ins><span class="cx"> // Notify the bundle client.
</span><span class="cx"> m_webPage.injectedBundleLoaderClient().didFinishProgress(&m_webPage);
</span><del>-
</del><ins>+
</ins><span class="cx"> m_webPage.send(Messages::WebPageProxy::DidFinishProgress());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (179072 => 179073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-24 20:30:35 UTC (rev 179072)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-24 20:36:59 UTC (rev 179073)
</span><span class="lines">@@ -328,6 +328,7 @@
</span><span class="cx"> , m_systemWebGLPolicy(WebGLAllowCreation)
</span><span class="cx"> #endif
</span><span class="cx"> , m_pageOverlayController(*this)
</span><ins>+ , m_mainFrameProgressCompleted(false)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageID);
</span><span class="cx"> // FIXME: This is a non-ideal location for this Setting and
</span><span class="lines">@@ -3927,19 +3928,22 @@
</span><span class="cx"> if (!request.url().protocolIsInHTTPFamily())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(!m_networkResourceRequestIdentifiers.contains(identifier));
- bool wasEmpty = m_networkResourceRequestIdentifiers.isEmpty();
- m_networkResourceRequestIdentifiers.add(identifier);
</del><ins>+ if (m_mainFrameProgressCompleted && !ScriptController::processingUserGesture())
+ return;
+
+ ASSERT(!m_trackedNetworkResourceRequestIdentifiers.contains(identifier));
+ bool wasEmpty = m_trackedNetworkResourceRequestIdentifiers.isEmpty();
+ m_trackedNetworkResourceRequestIdentifiers.add(identifier);
</ins><span class="cx"> if (wasEmpty)
</span><span class="cx"> send(Messages::WebPageProxy::SetNetworkRequestsInProgress(true));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::removeResourceRequest(unsigned long identifier)
</span><span class="cx"> {
</span><del>- if (!m_networkResourceRequestIdentifiers.remove(identifier))
</del><ins>+ if (!m_trackedNetworkResourceRequestIdentifiers.remove(identifier))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_networkResourceRequestIdentifiers.isEmpty())
</del><ins>+ if (m_trackedNetworkResourceRequestIdentifiers.isEmpty())
</ins><span class="cx"> send(Messages::WebPageProxy::SetNetworkRequestsInProgress(false));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (179072 => 179073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-01-24 20:30:35 UTC (rev 179072)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-01-24 20:36:59 UTC (rev 179073)
</span><span class="lines">@@ -845,6 +845,7 @@
</span><span class="cx">
</span><span class="cx"> void willChangeCurrentHistoryItemForMainFrame();
</span><span class="cx">
</span><ins>+ void setMainFrameProgressCompleted(bool completed) { m_mainFrameProgressCompleted = completed; }
</ins><span class="cx"> private:
</span><span class="cx"> WebPage(uint64_t pageID, const WebPageCreationParameters&);
</span><span class="cx">
</span><span class="lines">@@ -1213,7 +1214,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_cachedPageCount;
</span><span class="cx">
</span><del>- HashSet<unsigned long> m_networkResourceRequestIdentifiers;
</del><ins>+ HashSet<unsigned long> m_trackedNetworkResourceRequestIdentifiers;
</ins><span class="cx">
</span><span class="cx"> WebCore::IntSize m_minimumLayoutSize;
</span><span class="cx"> bool m_autoSizingShouldExpandToViewHeight;
</span><span class="lines">@@ -1286,6 +1287,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> PageOverlayController m_pageOverlayController;
</span><ins>+
+ bool m_mainFrameProgressCompleted;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>