<!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>[212810] 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/212810">212810</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-21 23:43:33 -0800 (Tue, 21 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/212786">r212786</a>.
https://bugs.webkit.org/show_bug.cgi?id=168710
It broke GTK+ port when using single shared process model
(Requested by KaL on #webkit).
Reverted changeset:
"Refactor WebViewImpl creation in preparation for supporting
multiple WebsiteDataStores."
https://bugs.webkit.org/show_bug.cgi?id=168676
http://trac.webkit.org/changeset/212786</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212809 => 212810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-22 06:57:13 UTC (rev 212809)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-22 07:43:33 UTC (rev 212810)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-21 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r212786.
+ https://bugs.webkit.org/show_bug.cgi?id=168710
+
+ It broke GTK+ port when using single shared process model
+ (Requested by KaL on #webkit).
+
+ Reverted changeset:
+
+ "Refactor WebViewImpl creation in preparation for supporting
+ multiple WebsiteDataStores."
+ https://bugs.webkit.org/show_bug.cgi?id=168676
+ http://trac.webkit.org/changeset/212786
+
</ins><span class="cx"> 2017-02-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor WebViewImpl creation in preparation for supporting multiple WebsiteDataStores.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (212809 => 212810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-22 06:57:13 UTC (rev 212809)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-22 07:43:33 UTC (rev 212810)
</span><span class="lines">@@ -549,12 +549,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- _impl = WebKit::WebViewImpl::maybeCreate(self, self, processPool, WTFMove(pageConfiguration));
- if (!_impl) {
- [NSException raise:NSInternalInconsistencyException format:@"WKWebView initialization failed. Unable to create a new WebProcess."];
- return;
- }
-
</del><ins>+ _impl = std::make_unique<WebKit::WebViewImpl>(self, self, processPool, WTFMove(pageConfiguration));
</ins><span class="cx"> _page = &_impl->page();
</span><span class="cx">
</span><span class="cx"> _impl->setAutomaticallyAdjustsContentInsets(true);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (212809 => 212810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2017-02-22 06:57:13 UTC (rev 212809)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2017-02-22 07:43:33 UTC (rev 212810)
</span><span class="lines">@@ -904,13 +904,8 @@
</span><span class="cx"> InitializeWebKit2();
</span><span class="cx">
</span><span class="cx"> _data = [[WKViewData alloc] init];
</span><ins>+ _data->_impl = std::make_unique<WebViewImpl>(self, nullptr, processPool, WTFMove(configuration));
</ins><span class="cx">
</span><del>- _data->_impl = WebViewImpl::maybeCreate(self, nullptr, processPool, WTFMove(configuration));
- if (!_data->_impl) {
- [NSException raise:NSInternalInconsistencyException format:@"[WKView initWithFrame:processPool:configuration:] failed to create a new WebProcess"];
- return nil;
- }
-
</del><span class="cx"> [self maybeInstallIconLoadingClient];
</span><span class="cx">
</span><span class="cx"> return self;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (212809 => 212810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2017-02-22 06:57:13 UTC (rev 212809)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2017-02-22 07:43:33 UTC (rev 212810)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebViewImpl);
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<WebViewImpl> maybeCreate(NSView <WebViewImplDelegate> *, WKWebView *outerWebView, WebProcessPool&, Ref<API::PageConfiguration>&&);
</del><ins>+ WebViewImpl(NSView <WebViewImplDelegate> *, WKWebView *outerWebView, WebProcessPool&, Ref<API::PageConfiguration>&&);
</ins><span class="cx">
</span><span class="cx"> ~WebViewImpl();
</span><span class="cx">
</span><span class="lines">@@ -523,8 +523,6 @@
</span><span class="cx"> #endif // HAVE(TOUCH_BAR)
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebViewImpl(NSView <WebViewImplDelegate> *, std::unique_ptr<PageClientImpl>&&, Ref<WebPageProxy>&&, WebProcessPool&);
-
</del><span class="cx"> #if HAVE(TOUCH_BAR)
</span><span class="cx"> void setUpTextTouchBar(NSTouchBar *);
</span><span class="cx"> void updateTextTouchBar();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (212809 => 212810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-02-22 06:57:13 UTC (rev 212809)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-02-22 07:43:33 UTC (rev 212810)
</span><span class="lines">@@ -1229,20 +1229,10 @@
</span><span class="cx"> return options;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<WebViewImpl> WebViewImpl::maybeCreate(NSView <WebViewImplDelegate> *view, WKWebView *outerWebView, WebProcessPool& processPool, Ref<API::PageConfiguration>&& configuration)
-{
- auto pageClient = std::make_unique<PageClientImpl>(view, outerWebView);
- auto webPage = processPool.createWebPage(*pageClient, WTFMove(configuration));
- if (!webPage)
- return nullptr;
-
- return std::unique_ptr<WebViewImpl>(new WebViewImpl(view, WTFMove(pageClient), *webPage, processPool));
-}
-
-WebViewImpl::WebViewImpl(NSView <WebViewImplDelegate> *view, std::unique_ptr<PageClientImpl>&& pageClient, Ref<WebPageProxy>&& page, WebProcessPool& processPool)
</del><ins>+WebViewImpl::WebViewImpl(NSView <WebViewImplDelegate> *view, WKWebView *outerWebView, WebProcessPool& processPool, Ref<API::PageConfiguration>&& configuration)
</ins><span class="cx"> : m_view(view)
</span><del>- , m_pageClient(WTFMove(pageClient))
- , m_page(WTFMove(page))
</del><ins>+ , m_pageClient(std::make_unique<PageClientImpl>(view, outerWebView))
+ , m_page(processPool.createWebPage(*m_pageClient, WTFMove(configuration)))
</ins><span class="cx"> , m_weakPtrFactory(this)
</span><span class="cx"> , m_needsViewFrameInWindowCoordinates(m_page->preferences().pluginsEnabled())
</span><span class="cx"> , m_intrinsicContentSize(CGSizeMake(NSViewNoInstrinsicMetric, NSViewNoInstrinsicMetric))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (212809 => 212810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-22 06:57:13 UTC (rev 212809)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-22 07:43:33 UTC (rev 212810)
</span><span class="lines">@@ -716,13 +716,8 @@
</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>- auto* newProcess = m_process->processPool().maybeCreateNewWebProcessRespectingProcessCountLimit(m_websiteDataStore.ptr());
- if (!newProcess) {
- WTFLogAlways("Couldn't reattach to a new web process");
- return;
- }
</del><ins>+ m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
</ins><span class="cx">
</span><del>- m_process = *newProcess;
</del><span class="cx"> ASSERT(m_process->state() != ChildProcessProxy::State::Terminated);
</span><span class="cx"> if (m_process->state() == ChildProcessProxy::State::Running)
</span><span class="cx"> processDidFinishLaunching();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (212809 => 212810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-22 06:57:13 UTC (rev 212809)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-22 07:43:33 UTC (rev 212810)
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> platformResolvePathsForSandboxExtensions();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy& WebProcessPool::createNewWebProcess(WebsiteDataStore* websiteDataStore)
</del><ins>+WebProcessProxy& WebProcessPool::createNewWebProcess()
</ins><span class="cx"> {
</span><span class="cx"> ensureNetworkProcess();
</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(nullptr);
</del><ins>+ createNewWebProcess();
</ins><span class="cx"> m_haveInitialEmptyProcess = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -769,25 +769,20 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy* WebProcessPool::maybeCreateNewWebProcessRespectingProcessCountLimit(WebsiteDataStore* websiteDataStore)
</del><ins>+WebProcessProxy& WebProcessPool::createNewWebProcessRespectingProcessCountLimit()
</ins><span class="cx"> {
</span><span class="cx"> if (m_processes.size() < maximumNumberOfProcesses())
</span><del>- return &createNewWebProcess(websiteDataStore);
</del><ins>+ return createNewWebProcess();
</ins><span class="cx">
</span><del>- // If a non-default WebsiteDataStore was passed in and we couldn't make a new web process for it,
- // we should not return an existing process.
- if (websiteDataStore && websiteDataStore != &API::WebsiteDataStore::defaultDataStore()->websiteDataStore())
- return nullptr;
-
</del><span class="cx"> // Choose the process with fewest pages.
</span><span class="cx"> auto& process = *std::min_element(m_processes.begin(), m_processes.end(), [](const RefPtr<WebProcessProxy>& a, const RefPtr<WebProcessProxy>& b) {
</span><span class="cx"> return a->pageCount() < b->pageCount();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- return process.get();
</del><ins>+ return *process;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebPageProxy> WebProcessPool::createWebPage(PageClient& pageClient, Ref<API::PageConfiguration>&& pageConfiguration)
</del><ins>+Ref<WebPageProxy> WebProcessPool::createWebPage(PageClient& pageClient, Ref<API::PageConfiguration>&& pageConfiguration)
</ins><span class="cx"> {
</span><span class="cx"> if (!pageConfiguration->pageGroup())
</span><span class="cx"> pageConfiguration->setPageGroup(m_defaultPageGroup.ptr());
</span><span class="lines">@@ -797,9 +792,7 @@
</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>-
- bool pageHasWebsiteDataStore = pageConfiguration->websiteDataStore();
- if (!pageHasWebsiteDataStore) {
</del><ins>+ if (!pageConfiguration->websiteDataStore()) {
</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">@@ -806,7 +799,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebProcessProxy> process;
</span><del>- if (m_haveInitialEmptyProcess && !pageHasWebsiteDataStore) {
</del><ins>+ if (m_haveInitialEmptyProcess) {
</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">@@ -813,7 +806,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 = maybeCreateNewWebProcessRespectingProcessCountLimit(&pageConfiguration->websiteDataStore()->websiteDataStore());
</del><ins>+ process = &createNewWebProcessRespectingProcessCountLimit();
</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 (212809 => 212810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-02-22 06:57:13 UTC (rev 212809)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-02-22 07:43:33 UTC (rev 212810)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> API::WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
</span><span class="cx">
</span><del>- RefPtr<WebPageProxy> createWebPage(PageClient&, Ref<API::PageConfiguration>&&);
</del><ins>+ Ref<WebPageProxy> createWebPage(PageClient&, Ref<API::PageConfiguration>&&);
</ins><span class="cx">
</span><span class="cx"> const String& injectedBundlePath() const { return m_configuration->injectedBundlePath(); }
</span><span class="cx">
</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* maybeCreateNewWebProcessRespectingProcessCountLimit(WebsiteDataStore*); // Will return an existing one if limit is met.
</del><ins>+ WebProcessProxy& createNewWebProcessRespectingProcessCountLimit(); // 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(WebsiteDataStore*);
</del><ins>+ WebProcessProxy& createNewWebProcess();
</ins><span class="cx">
</span><span class="cx"> void requestWebContentStatistics(StatisticsRequest*);
</span><span class="cx"> void requestNetworkingStatistics(StatisticsRequest*);
</span></span></pre>
</div>
</div>
</body>
</html>