<!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>[213168] trunk/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/213168">213168</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-28 13:24:50 -0800 (Tue, 28 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor WebViewImpl creation in preparation for supporting multiple WebsiteDataStores.
https://bugs.webkit.org/show_bug.cgi?id=168676
Reviewed by Alex Christensen and Sam Weinig.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::warmInitialProcess):
(WebKit::WebProcessPool::createNewWebProcessRespectingProcessCountLimit):
(WebKit::WebProcessPool::createWebPage):
* UIProcess/WebProcessPool.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213167 => 213168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-28 21:13:46 UTC (rev 213167)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-28 21:24:50 UTC (rev 213168)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-28 Brady Eidson <beidson@apple.com>
+
+ Refactor WebViewImpl creation in preparation for supporting multiple WebsiteDataStores.
+ https://bugs.webkit.org/show_bug.cgi?id=168676
+
+ Reviewed by Alex Christensen and Sam Weinig.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess):
+ (WebKit::WebProcessPool::warmInitialProcess):
+ (WebKit::WebProcessPool::createNewWebProcessRespectingProcessCountLimit):
+ (WebKit::WebProcessPool::createWebPage):
+ * UIProcess/WebProcessPool.h:
+
</ins><span class="cx"> 2017-02-28 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Limit libwebrtc logging in Debug build
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (213167 => 213168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-28 21:13:46 UTC (rev 213167)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-28 21:24:50 UTC (rev 213168)
</span><span class="lines">@@ -715,7 +715,7 @@
</span><span class="cx"> m_process->removeWebPage(m_pageID);
</span><span class="cx"> m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
</span><span class="cx">
</span><del>- m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
</del><ins>+ m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit(m_websiteDataStore.ptr());
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_process->state() != ChildProcessProxy::State::Terminated);
</span><span class="cx"> if (m_process->state() == ChildProcessProxy::State::Running)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (213167 => 213168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-28 21:13:46 UTC (rev 213167)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-28 21:24:50 UTC (rev 213168)
</span><span class="lines">@@ -557,11 +557,11 @@
</span><span class="cx"> platformResolvePathsForSandboxExtensions();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy& WebProcessPool::createNewWebProcess()
</del><ins>+WebProcessProxy& WebProcessPool::createNewWebProcess(WebsiteDataStore* websiteDataStore)
</ins><span class="cx"> {
</span><span class="cx"> ensureNetworkProcess();
</span><span class="cx">
</span><del>- Ref<WebProcessProxy> process = WebProcessProxy::create(*this);
</del><ins>+ Ref<WebProcessProxy> process = WebProcessProxy::create(*this, websiteDataStore);
</ins><span class="cx">
</span><span class="cx"> WebProcessCreationParameters parameters;
</span><span class="cx">
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx"> if (m_processes.size() >= maximumNumberOfProcesses())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- createNewWebProcess();
</del><ins>+ createNewWebProcess(nullptr);
</ins><span class="cx"> m_haveInitialEmptyProcess = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -769,13 +769,34 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy& WebProcessPool::createNewWebProcessRespectingProcessCountLimit()
</del><ins>+WebProcessProxy& WebProcessPool::createNewWebProcessRespectingProcessCountLimit(WebsiteDataStore* websiteDataStore)
</ins><span class="cx"> {
</span><ins>+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=168676
+ // Once WebsiteDataStores are not per-process, remove this nonsense.
+
+#if PLATFORM(COCOA)
+ bool mustMatchDataStore = websiteDataStore && websiteDataStore != &API::WebsiteDataStore::defaultDataStore()->websiteDataStore();
+#else
+ bool mustMatchDataStore = false;
+#endif
+
</ins><span class="cx"> if (m_processes.size() < maximumNumberOfProcesses())
</span><del>- return createNewWebProcess();
</del><ins>+ return createNewWebProcess(websiteDataStore);
</ins><span class="cx">
</span><ins>+ Vector<RefPtr<WebProcessProxy>> processesMatchingDataStore;
+ if (mustMatchDataStore) {
+ for (auto& process : m_processes) {
+ if (process->websiteDataStore() == websiteDataStore)
+ processesMatchingDataStore.append(process);
+ }
+
+ if (processesMatchingDataStore.isEmpty())
+ return createNewWebProcess(websiteDataStore);
+ }
+
</ins><span class="cx"> // Choose the process with fewest pages.
</span><del>- auto& process = *std::min_element(m_processes.begin(), m_processes.end(), [](const RefPtr<WebProcessProxy>& a, const RefPtr<WebProcessProxy>& b) {
</del><ins>+ auto* processes = mustMatchDataStore ? &m_processes : &processesMatchingDataStore;
+ auto& process = *std::min_element(processes->begin(), processes->end(), [](const RefPtr<WebProcessProxy>& a, const RefPtr<WebProcessProxy>& b) {
</ins><span class="cx"> return a->pageCount() < b->pageCount();
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -792,7 +813,9 @@
</span><span class="cx"> pageConfiguration->setUserContentController(&pageConfiguration->pageGroup()->userContentController());
</span><span class="cx"> if (!pageConfiguration->visitedLinkStore())
</span><span class="cx"> pageConfiguration->setVisitedLinkStore(m_visitedLinkStore.ptr());
</span><del>- if (!pageConfiguration->websiteDataStore()) {
</del><ins>+
+ bool pageHasWebsiteDataStore = pageConfiguration->websiteDataStore();
+ if (!pageHasWebsiteDataStore) {
</ins><span class="cx"> ASSERT(!pageConfiguration->sessionID().isValid());
</span><span class="cx"> pageConfiguration->setWebsiteDataStore(m_websiteDataStore.get());
</span><span class="cx"> pageConfiguration->setSessionID(pageConfiguration->preferences()->privateBrowsingEnabled() ? SessionID::legacyPrivateSessionID() : SessionID::defaultSessionID());
</span><span class="lines">@@ -799,7 +822,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebProcessProxy> process;
</span><del>- if (m_haveInitialEmptyProcess) {
</del><ins>+ if (m_haveInitialEmptyProcess && !pageHasWebsiteDataStore) {
</ins><span class="cx"> process = m_processes.last();
</span><span class="cx"> m_haveInitialEmptyProcess = false;
</span><span class="cx"> } else if (pageConfiguration->relatedPage()) {
</span><span class="lines">@@ -806,7 +829,7 @@
</span><span class="cx"> // Sharing processes, e.g. when creating the page via window.open().
</span><span class="cx"> process = &pageConfiguration->relatedPage()->process();
</span><span class="cx"> } else
</span><del>- process = &createNewWebProcessRespectingProcessCountLimit();
</del><ins>+ process = &createNewWebProcessRespectingProcessCountLimit(&pageConfiguration->websiteDataStore()->websiteDataStore());
</ins><span class="cx">
</span><span class="cx"> return process->createWebPage(pageClient, WTFMove(pageConfiguration));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (213167 => 213168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-02-28 21:13:46 UTC (rev 213167)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-02-28 21:24:50 UTC (rev 213168)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx">
</span><span class="cx"> void allowSpecificHTTPSCertificateForHost(const WebCertificateInfo*, const String& host);
</span><span class="cx">
</span><del>- WebProcessProxy& createNewWebProcessRespectingProcessCountLimit(); // Will return an existing one if limit is met.
</del><ins>+ WebProcessProxy& createNewWebProcessRespectingProcessCountLimit(WebsiteDataStore*); // Will return an existing one if limit is met.
</ins><span class="cx"> void warmInitialProcess();
</span><span class="cx">
</span><span class="cx"> bool shouldTerminate(WebProcessProxy*);
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx"> void platformInitializeWebProcess(WebProcessCreationParameters&);
</span><span class="cx"> void platformInvalidateContext();
</span><span class="cx">
</span><del>- WebProcessProxy& createNewWebProcess();
</del><ins>+ WebProcessProxy& createNewWebProcess(WebsiteDataStore*);
</ins><span class="cx">
</span><span class="cx"> void requestWebContentStatistics(StatisticsRequest*);
</span><span class="cx"> void requestNetworkingStatistics(StatisticsRequest*);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (213167 => 213168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-02-28 21:13:46 UTC (rev 213167)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-02-28 21:24:50 UTC (rev 213168)
</span><span class="lines">@@ -89,12 +89,12 @@
</span><span class="cx"> return pageMap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<WebProcessProxy> WebProcessProxy::create(WebProcessPool& processPool)
</del><ins>+Ref<WebProcessProxy> WebProcessProxy::create(WebProcessPool& processPool, WebsiteDataStore* websiteDataStore)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebProcessProxy(processPool));
</del><ins>+ return adoptRef(*new WebProcessProxy(processPool, websiteDataStore));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy::WebProcessProxy(WebProcessPool& processPool)
</del><ins>+WebProcessProxy::WebProcessProxy(WebProcessPool& processPool, WebsiteDataStore* websiteDataStore)
</ins><span class="cx"> : ChildProcessProxy(processPool.alwaysRunsAtBackgroundPriority())
</span><span class="cx"> , m_responsivenessTimer(*this)
</span><span class="cx"> , m_processPool(processPool)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> , m_isResponsive(NoOrMaybe::Maybe)
</span><span class="cx"> , m_visiblePageCounter([this](RefCounterEvent) { updateBackgroundResponsivenessTimer(); })
</span><span class="cx"> , m_backgroundResponsivenessTimer(std::make_unique<BackgroundProcessResponsivenessTimer>(*this))
</span><ins>+ , m_websiteDataStore(websiteDataStore)
</ins><span class="cx"> {
</span><span class="cx"> WebPasteboardProxy::singleton().addWebProcessProxy(*this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (213167 => 213168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-02-28 21:13:46 UTC (rev 213167)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-02-28 21:24:50 UTC (rev 213168)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> class WebBackForwardListItem;
</span><span class="cx"> class WebPageGroup;
</span><span class="cx"> class WebProcessPool;
</span><ins>+class WebsiteDataStore;
</ins><span class="cx"> enum class WebsiteDataType;
</span><span class="cx"> struct WebNavigationDataStore;
</span><span class="cx"> struct WebsiteData;
</span><span class="lines">@@ -70,7 +71,7 @@
</span><span class="cx"> typedef HashMap<uint64_t, WebPageProxy*> WebPageProxyMap;
</span><span class="cx"> typedef HashMap<uint64_t, RefPtr<API::UserInitiatedAction>> UserInitiatedActionMap;
</span><span class="cx">
</span><del>- static Ref<WebProcessProxy> create(WebProcessPool&);
</del><ins>+ static Ref<WebProcessProxy> create(WebProcessPool&, WebsiteDataStore*);
</ins><span class="cx"> ~WebProcessProxy();
</span><span class="cx">
</span><span class="cx"> WebConnection* webConnection() const { return m_webConnection.get(); }
</span><span class="lines">@@ -77,6 +78,9 @@
</span><span class="cx">
</span><span class="cx"> WebProcessPool& processPool() { return m_processPool; }
</span><span class="cx">
</span><ins>+ // FIXME: WebsiteDataStores should be made per-WebPageProxy throughout WebKit2
+ WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
+
</ins><span class="cx"> static WebPageProxy* webPage(uint64_t pageID);
</span><span class="cx"> Ref<WebPageProxy> createWebPage(PageClient&, Ref<API::PageConfiguration>&&);
</span><span class="cx"> void addExistingWebPage(WebPageProxy*, uint64_t pageID);
</span><span class="lines">@@ -155,7 +159,7 @@
</span><span class="cx"> void didReceiveMainThreadPing();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit WebProcessProxy(WebProcessPool&);
</del><ins>+ explicit WebProcessProxy(WebProcessPool&, WebsiteDataStore*);
</ins><span class="cx">
</span><span class="cx"> // From ChildProcessProxy
</span><span class="cx"> void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
</span><span class="lines">@@ -256,6 +260,9 @@
</span><span class="cx">
</span><span class="cx"> VisibleWebPageCounter m_visiblePageCounter;
</span><span class="cx"> std::unique_ptr<BackgroundProcessResponsivenessTimer> m_backgroundResponsivenessTimer;
</span><ins>+
+ // FIXME: WebsiteDataStores should be made per-WebPageProxy throughout WebKit2. Get rid of this member.
+ RefPtr<WebsiteDataStore> m_websiteDataStore;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>