<!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>[185542] 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/185542">185542</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-06-13 21:53:14 -0700 (Sat, 13 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
https://bugs.webkit.org/show_bug.cgi?id=145948
Reviewed by Darin Adler.
Source/WebCore:
API::Navigation objects were leaked on history navigation to
HistoryItems in PageCache. In such case, we would create 2 Navigation
objects instead of 1 and the first one would be leaked. The reason
we create the second one is because we fail to pass along the
navigationID from the UIProcess to the WebProcess and then back to the
UIProcess. On the IPC back to the UIProcess, the navigationID ends up
being 0 so the UIProcess creates a new Navigation object, thinking that
the load was triggered by the WebContent process.
We now pass along the navigationID, even if the HistoryItem is in the
PageCache and we end up reusing the cached DocumentLoader, instead of
creating a new one. A new updateCachedDocumentLoader() delegate is
added to the FrameLoaderClient, similarly to the pre-existing
createDocumentLoader() but for the case where the DocumentLoader gets
reused.
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadDifferentDocumentItem):
* loader/FrameLoaderClient.h:
Source/WebKit/mac:
Add empty implementation for new
FrameLoaderClient::updatedCachedDocumentLoader().
* WebCoreSupport/WebFrameLoaderClient.h:
Source/WebKit/win:
Add empty implementation for new
FrameLoaderClient::updatedCachedDocumentLoader().
* WebCoreSupport/WebFrameLoaderClient.h:
Source/WebKit2:
API::Navigation objects were leaked on history navigation to
HistoryItems in PageCache. In such case, we would create 2 Navigation
objects instead of 1 and the first one would be leaked. The reason
we create the second one is because we fail to pass along the
navigationID from the UIProcess to the WebProcess and then back to the
UIProcess. On the IPC back to the UIProcess, the navigationID ends up
being 0 so the UIProcess creates a new Navigation object, thinking that
the load was triggered by the WebContent process.
We now pass along the navigationID, even if the HistoryItem is in the
PageCache and we end up reusing the cached DocumentLoader, instead of
creating a new one. A new updateCachedDocumentLoader() delegate is
added to the FrameLoaderClient, similarly to the pre-existing
createDocumentLoader() but for the case where the DocumentLoader gets
reused.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::updateCachedDocumentLoader):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::goForward):
(WebKit::WebPage::goBack):
(WebKit::WebPage::goToBackForwardItem):
(WebKit::WebPage::updateCachedDocumentLoader):
* WebProcess/WebPage/WebPage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebCore/ChangeLog 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-06-13 Chris Dumez <cdumez@apple.com>
+
+ [WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
+ https://bugs.webkit.org/show_bug.cgi?id=145948
+
+ Reviewed by Darin Adler.
+
+ API::Navigation objects were leaked on history navigation to
+ HistoryItems in PageCache. In such case, we would create 2 Navigation
+ objects instead of 1 and the first one would be leaked. The reason
+ we create the second one is because we fail to pass along the
+ navigationID from the UIProcess to the WebProcess and then back to the
+ UIProcess. On the IPC back to the UIProcess, the navigationID ends up
+ being 0 so the UIProcess creates a new Navigation object, thinking that
+ the load was triggered by the WebContent process.
+
+ We now pass along the navigationID, even if the HistoryItem is in the
+ PageCache and we end up reusing the cached DocumentLoader, instead of
+ creating a new one. A new updateCachedDocumentLoader() delegate is
+ added to the FrameLoaderClient, similarly to the pre-existing
+ createDocumentLoader() but for the case where the DocumentLoader gets
+ reused.
+
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadDifferentDocumentItem):
+ * loader/FrameLoaderClient.h:
+
</ins><span class="cx"> 2015-06-13 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] ReadableJSStream should handle promises returned by JS source start callback
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -347,6 +347,7 @@
</span><span class="cx"> virtual void prepareForDataSourceReplacement() override { }
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&) override;
</span><ins>+ virtual void updateCachedDocumentLoader(DocumentLoader&) override { }
</ins><span class="cx"> virtual void setTitle(const StringWithDirection&, const URL&) override { }
</span><span class="cx">
</span><span class="cx"> virtual String userAgent(const URL&) override { return ""; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -3177,6 +3177,7 @@
</span><span class="cx">
</span><span class="cx"> if (CachedPage* cachedPage = PageCache::singleton().get(item, m_frame.page())) {
</span><span class="cx"> auto documentLoader = cachedPage->documentLoader();
</span><ins>+ m_client.updateCachedDocumentLoader(*documentLoader);
</ins><span class="cx"> documentLoader->setTriggeringAction(NavigationAction(documentLoader->request(), loadType, false));
</span><span class="cx"> documentLoader->setLastCheckedRequest(ResourceRequest());
</span><span class="cx"> loadWithDocumentLoader(documentLoader, loadType, 0, AllowNavigationToInvalidURL::Yes);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -251,6 +251,7 @@
</span><span class="cx"> virtual void prepareForDataSourceReplacement() = 0;
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&) = 0;
</span><ins>+ virtual void updateCachedDocumentLoader(DocumentLoader&) = 0;
</ins><span class="cx"> virtual void setTitle(const StringWithDirection&, const URL&) = 0;
</span><span class="cx">
</span><span class="cx"> virtual String userAgent(const URL&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-13 Chris Dumez <cdumez@apple.com>
+
+ [WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
+ https://bugs.webkit.org/show_bug.cgi?id=145948
+
+ Reviewed by Darin Adler.
+
+ Add empty implementation for new
+ FrameLoaderClient::updatedCachedDocumentLoader().
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2015-06-11 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> WebCore::reportException() needs to be able to accept a raw thrown value in addition to Exception objects.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -193,6 +193,7 @@
</span><span class="cx"> virtual void didFinishLoad() override;
</span><span class="cx"> virtual void prepareForDataSourceReplacement() override;
</span><span class="cx"> virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) override;
</span><ins>+ virtual void updateCachedDocumentLoader(WebCore::DocumentLoader&) override { }
</ins><span class="cx">
</span><span class="cx"> virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit/win/ChangeLog 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-13 Chris Dumez <cdumez@apple.com>
+
+ [WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
+ https://bugs.webkit.org/show_bug.cgi?id=145948
+
+ Reviewed by Darin Adler.
+
+ Add empty implementation for new
+ FrameLoaderClient::updatedCachedDocumentLoader().
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2015-06-11 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> WebCore::reportException() needs to be able to accept a raw thrown value in addition to Exception objects.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -152,6 +152,8 @@
</span><span class="cx"> virtual WTF::String userAgent(const WebCore::URL&) override;
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
</span><ins>+ virtual void updateCachedDocumentLoader(WebCore::DocumentLoader&) override { }
+
</ins><span class="cx"> virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&);
</span><span class="cx">
</span><span class="cx"> virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-06-13 Chris Dumez <cdumez@apple.com>
+
+ [WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
+ https://bugs.webkit.org/show_bug.cgi?id=145948
+
+ Reviewed by Darin Adler.
+
+ API::Navigation objects were leaked on history navigation to
+ HistoryItems in PageCache. In such case, we would create 2 Navigation
+ objects instead of 1 and the first one would be leaked. The reason
+ we create the second one is because we fail to pass along the
+ navigationID from the UIProcess to the WebProcess and then back to the
+ UIProcess. On the IPC back to the UIProcess, the navigationID ends up
+ being 0 so the UIProcess creates a new Navigation object, thinking that
+ the load was triggered by the WebContent process.
+
+ We now pass along the navigationID, even if the HistoryItem is in the
+ PageCache and we end up reusing the cached DocumentLoader, instead of
+ creating a new one. A new updateCachedDocumentLoader() delegate is
+ added to the FrameLoaderClient, similarly to the pre-existing
+ createDocumentLoader() but for the case where the DocumentLoader gets
+ reused.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::updateCachedDocumentLoader):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::goForward):
+ (WebKit::WebPage::goBack):
+ (WebKit::WebPage::goToBackForwardItem):
+ (WebKit::WebPage::updateCachedDocumentLoader):
+ * WebProcess/WebPage/WebPage.h:
+
</ins><span class="cx"> 2015-06-12 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Add private API to force page to always run at foreground priority
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -1246,6 +1246,11 @@
</span><span class="cx"> return m_frame->page()->createDocumentLoader(*m_frame->coreFrame(), request, substituteData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebFrameLoaderClient::updateCachedDocumentLoader(WebCore::DocumentLoader& loader)
+{
+ m_frame->page()->updateCachedDocumentLoader(static_cast<WebDocumentLoader&>(loader), *m_frame->coreFrame());
+}
+
</ins><span class="cx"> void WebFrameLoaderClient::setTitle(const StringWithDirection& title, const URL& url)
</span><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -164,6 +164,8 @@
</span><span class="cx"> virtual void prepareForDataSourceReplacement() override;
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&) override;
</span><ins>+ virtual void updateCachedDocumentLoader(WebCore::DocumentLoader&) override;
+
</ins><span class="cx"> virtual void setTitle(const WebCore::StringWithDirection&, const WebCore::URL&) override;
</span><span class="cx">
</span><span class="cx"> virtual String userAgent(const WebCore::URL&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -1161,8 +1161,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_pendingNavigationID);
</span><del>- if (!item->isInPageCache())
- m_pendingNavigationID = navigationID;
</del><ins>+ m_pendingNavigationID = navigationID;
</ins><span class="cx">
</span><span class="cx"> m_page->goToItem(*item, FrameLoadType::Forward);
</span><span class="cx"> }
</span><span class="lines">@@ -1177,8 +1176,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_pendingNavigationID);
</span><del>- if (!item->isInPageCache())
- m_pendingNavigationID = navigationID;
</del><ins>+ m_pendingNavigationID = navigationID;
</ins><span class="cx">
</span><span class="cx"> m_page->goToItem(*item, FrameLoadType::Back);
</span><span class="cx"> }
</span><span class="lines">@@ -1193,8 +1191,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_pendingNavigationID);
</span><del>- if (!item->isInPageCache())
- m_pendingNavigationID = navigationID;
</del><ins>+ m_pendingNavigationID = navigationID;
</ins><span class="cx">
</span><span class="cx"> m_page->goToItem(*item, FrameLoadType::IndexedBackForward);
</span><span class="cx"> }
</span><span class="lines">@@ -4924,6 +4921,14 @@
</span><span class="cx"> return documentLoader.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::updateCachedDocumentLoader(WebDocumentLoader& documentLoader, Frame& frame)
+{
+ if (m_pendingNavigationID && frame.isMainFrame()) {
+ documentLoader.setNavigationID(m_pendingNavigationID);
+ m_pendingNavigationID = 0;
+ }
+}
+
</ins><span class="cx"> void WebPage::getBytecodeProfile(uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> if (!JSDOMWindow::commonVM().m_perBytecodeProfiler) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (185541 => 185542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-14 00:24:43 UTC (rev 185541)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-14 04:53:14 UTC (rev 185542)
</span><span class="lines">@@ -153,6 +153,7 @@
</span><span class="cx"> class WebColorChooser;
</span><span class="cx"> class WebContextMenu;
</span><span class="cx"> class WebContextMenuItemData;
</span><ins>+class WebDocumentLoader;
</ins><span class="cx"> class WebEvent;
</span><span class="cx"> class WebFrame;
</span><span class="cx"> class WebFullScreenManager;
</span><span class="lines">@@ -871,6 +872,7 @@
</span><span class="cx"> void setScrollbarOverlayStyle(WTF::Optional<uint32_t /* WebCore::ScrollbarOverlayStyle */> scrollbarStyle);
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(WebCore::Frame&, const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
</span><ins>+ void updateCachedDocumentLoader(WebDocumentLoader&, WebCore::Frame&);
</ins><span class="cx">
</span><span class="cx"> void getBytecodeProfile(uint64_t callbackID);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>