Diff
Modified: tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog 2015-12-06 22:23:40 UTC (rev 193596)
@@ -1,3 +1,7 @@
+2015-12-06 Babak Shafiei <bshaf...@apple.com>
+
+ Roll out r192808.
+
2015-12-01 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r192914.
Modified: tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -139,15 +139,6 @@
{
}
-void WKContextSetProcessModel(WKContextRef, WKProcessModel)
-{
-}
-
-WKProcessModel WKContextGetProcessModel(WKContextRef)
-{
- return kWKProcessModelMultipleSecondaryProcesses;
-}
-
#if PLATFORM(MAC)
CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
{
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -41,7 +41,14 @@
auto configuration = ProcessPoolConfiguration::create();
configuration->m_shouldHaveLegacyDataStore = true;
+#if PLATFORM(GTK)
+ // FIXME: Remove this ifdef once all ports have switched to use always NetworkProcess.
+ // See https://bugs.webkit.org/show_bug.cgi?id=151418.
+ configuration->m_processModel = WebKit::ProcessModelMultipleSecondaryProcesses;
configuration->m_maximumProcessCount = 1;
+#else
+ configuration->m_processModel = WebKit::ProcessModelSharedSecondaryProcess;
+#endif
configuration->m_cacheModel = WebKit::CacheModelDocumentViewer;
configuration->m_applicationCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
@@ -73,6 +80,7 @@
auto copy = this->create();
copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
+ copy->m_processModel = this->m_processModel;
copy->m_maximumProcessCount = this->m_maximumProcessCount;
copy->m_cacheModel = this->m_cacheModel;
copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-12-06 22:23:40 UTC (rev 193596)
@@ -28,6 +28,7 @@
#include "APIObject.h"
#include "CacheModel.h"
+#include "ProcessModel.h"
#include <wtf/Ref.h>
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
@@ -47,6 +48,9 @@
bool shouldHaveLegacyDataStore() const { return m_shouldHaveLegacyDataStore; }
void setShouldHaveLegacyDataStore(bool shouldHaveLegacyDataStore) { m_shouldHaveLegacyDataStore = shouldHaveLegacyDataStore; }
+ WebKit::ProcessModel processModel() const { return m_processModel; }
+ void setProcessModel(WebKit::ProcessModel processModel) { m_processModel = processModel; }
+
unsigned maximumProcessCount() const { return m_maximumProcessCount; }
void setMaximumProcessCount(unsigned maximumProcessCount) { m_maximumProcessCount = maximumProcessCount; }
@@ -89,6 +93,7 @@
private:
bool m_shouldHaveLegacyDataStore { false };
+ WebKit::ProcessModel m_processModel { WebKit::ProcessModelMultipleSecondaryProcesses };
unsigned m_maximumProcessCount { 0 };
WebKit::CacheModel m_cacheModel { WebKit::CacheModelPrimaryWebBrowser };
int64_t m_diskCacheSizeOverride { -1 };
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKAPICast.h (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-12-06 22:23:40 UTC (rev 193596)
@@ -32,6 +32,7 @@
#include "HTTPCookieAcceptPolicy.h"
#include "InjectedBundleHitTestResultMediaType.h"
#include "PluginModuleInfo.h"
+#include "ProcessModel.h"
#include "ResourceCachesToClear.h"
#include "WKBundleHitTestResult.h"
#include "WKContext.h"
@@ -229,6 +230,31 @@
return kWKCacheModelDocumentViewer;
}
+inline ProcessModel toProcessModel(WKProcessModel wkProcessModel)
+{
+ switch (wkProcessModel) {
+ case kWKProcessModelSharedSecondaryProcess:
+ return ProcessModelSharedSecondaryProcess;
+ case kWKProcessModelMultipleSecondaryProcesses:
+ return ProcessModelMultipleSecondaryProcesses;
+ }
+
+ ASSERT_NOT_REACHED();
+ return ProcessModelSharedSecondaryProcess;
+}
+
+inline WKProcessModel toAPI(ProcessModel processModel)
+{
+ switch (processModel) {
+ case ProcessModelSharedSecondaryProcess:
+ return kWKProcessModelSharedSecondaryProcess;
+ case ProcessModelMultipleSecondaryProcesses:
+ return kWKProcessModelMultipleSecondaryProcesses;
+ }
+
+ return kWKProcessModelSharedSecondaryProcess;
+}
+
inline FontSmoothingLevel toFontSmoothingLevel(WKFontSmoothingLevel wkLevel)
{
switch (wkLevel) {
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -329,6 +329,16 @@
return toAPI(toImpl(contextRef)->cacheModel());
}
+void WKContextSetProcessModel(WKContextRef contextRef, WKProcessModel processModel)
+{
+ toImpl(contextRef)->setProcessModel(toProcessModel(processModel));
+}
+
+WKProcessModel WKContextGetProcessModel(WKContextRef contextRef)
+{
+ return toAPI(toImpl(contextRef)->processModel());
+}
+
void WKContextSetMaximumNumberOfProcesses(WKContextRef contextRef, unsigned numberOfProcesses)
{
toImpl(contextRef)->setMaximumNumberOfProcesses(numberOfProcesses);
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.h (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-12-06 22:23:40 UTC (rev 193596)
@@ -75,7 +75,6 @@
WKContextCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey;
} WKContextClientV1;
-// FIXME: Remove these once support for Mavericks has been dropped.
enum {
kWKProcessModelSharedSecondaryProcess = 0,
kWKProcessModelMultipleSecondaryProcesses = 1
@@ -112,9 +111,8 @@
WK_EXPORT void WKContextSetCacheModel(WKContextRef context, WKCacheModel cacheModel);
WK_EXPORT WKCacheModel WKContextGetCacheModel(WKContextRef context);
-// FIXME: Move these to WKDeprecatedFunctions.cpp once support for Mavericks has been dropped.
-WK_EXPORT void WKContextSetProcessModel(WKContextRef, WKProcessModel);
-WK_EXPORT WKProcessModel WKContextGetProcessModel(WKContextRef);
+WK_EXPORT void WKContextSetProcessModel(WKContextRef context, WKProcessModel processModel);
+WK_EXPORT WKProcessModel WKContextGetProcessModel(WKContextRef context);
WK_EXPORT void WKContextSetMaximumNumberOfProcesses(WKContextRef context, unsigned numberOfProcesses);
WK_EXPORT unsigned WKContextGetMaximumNumberOfProcesses(WKContextRef context);
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2015-12-06 22:23:40 UTC (rev 193596)
@@ -192,6 +192,9 @@
auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
configuration->setInjectedBundlePath(bundleURL ? String(bundleURL.path) : String());
+#if PLATFORM(IOS)
+ configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
+#endif
_processPool = WebProcessPool::create(configuration);
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2015-12-06 22:23:40 UTC (rev 193596)
@@ -30,6 +30,7 @@
#import "CacheModel.h"
#import "DownloadClient.h"
+#import "ProcessModel.h"
#import "SandboxUtilities.h"
#import "WKObject.h"
#import "WeakObjCPtr.h"
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -257,13 +257,45 @@
return static_cast<Ewk_Cache_Model>(WKContextGetCacheModel(m_context.get()));
}
-void EwkContext::setProcessModel(Ewk_Process_Model)
+inline WKProcessModel toWKProcessModel(Ewk_Process_Model processModel)
{
+ switch (processModel) {
+ case EWK_PROCESS_MODEL_SHARED_SECONDARY:
+ return kWKProcessModelSharedSecondaryProcess;
+ case EWK_PROCESS_MODEL_MULTIPLE_SECONDARY:
+ return kWKProcessModelMultipleSecondaryProcesses;
+ }
+ ASSERT_NOT_REACHED();
+
+ return kWKProcessModelSharedSecondaryProcess;
}
+void EwkContext::setProcessModel(Ewk_Process_Model processModel)
+{
+ WKProcessModel newWKProcessModel = toWKProcessModel(processModel);
+
+ if (WKContextGetProcessModel(m_context.get()) == newWKProcessModel)
+ return;
+
+ WKContextSetProcessModel(m_context.get(), newWKProcessModel);
+}
+
+inline Ewk_Process_Model toEwkProcessModel(WKProcessModel processModel)
+{
+ switch (processModel) {
+ case kWKProcessModelSharedSecondaryProcess:
+ return EWK_PROCESS_MODEL_SHARED_SECONDARY;
+ case kWKProcessModelMultipleSecondaryProcesses:
+ return EWK_PROCESS_MODEL_MULTIPLE_SECONDARY;
+ }
+ ASSERT_NOT_REACHED();
+
+ return EWK_PROCESS_MODEL_SHARED_SECONDARY;
+}
+
Ewk_Process_Model EwkContext::processModel() const
{
- return EWK_PROCESS_MODEL_MULTIPLE_SECONDARY;
+ return toEwkProcessModel(WKContextGetProcessModel(m_context.get()));
}
#if ENABLE(NETSCAPE_PLUGIN_API)
@@ -279,6 +311,7 @@
WKResourceCacheManagerClearCacheForAllOrigins(WKContextGetResourceCacheManager(m_context.get()), WKResourceCachesToClearAll);
}
+
JSGlobalContextRef EwkContext::jsGlobalContext()
{
if (!m_jsGlobalContext)
@@ -534,15 +567,20 @@
impl->setMessageFromExtensionCallback(callback, userData);
}
-Eina_Bool ewk_context_process_model_set(Ewk_Context* ewkContext, Ewk_Process_Model)
+Eina_Bool ewk_context_process_model_set(Ewk_Context* ewkContext, Ewk_Process_Model processModel)
{
EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl, false);
+
+ impl->setProcessModel(processModel);
+
return true;
}
Ewk_Process_Model ewk_context_process_model_get(const Ewk_Context* ewkContext)
{
- return EWK_PROCESS_MODEL_MULTIPLE_SECONDARY;
+ EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, EWK_PROCESS_MODEL_SHARED_SECONDARY);
+
+ return impl->processModel();
}
Ewk_TLS_Error_Policy ewk_context_tls_error_policy_get(const Ewk_Context* context)
Copied: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/ProcessModel.h (from rev 192807, trunk/Source/WebKit2/UIProcess/ProcessModel.h) (0 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/ProcessModel.h (rev 0)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/ProcessModel.h 2015-12-06 22:23:40 UTC (rev 193596)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ProcessModel_h
+#define ProcessModel_h
+
+namespace WebKit {
+
+enum ProcessModel {
+ ProcessModelSharedSecondaryProcess,
+ ProcessModelMultipleSecondaryProcesses
+};
+
+} // namespace WebKit
+
+#endif // ProcessModel_h
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -85,7 +85,8 @@
bool WebCookieManagerProxy::shouldTerminate(WebProcessProxy*) const
{
- return true;
+ return processPool()->processModel() != ProcessModelSharedSecondaryProcess
+ || (m_arrayCallbacks.isEmpty() && m_httpCookieAcceptPolicyCallbacks.isEmpty());
}
void WebCookieManagerProxy::refWebContextSupplement()
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -312,6 +312,7 @@
// guarantees no process sharing for our user interface.
if (!s_processPool) {
auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
+ configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
s_processPool = &WebProcessPool::create(configuration.get()).leakRef();
};
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebPageProxy.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -688,7 +688,10 @@
m_process->removeWebPage(m_pageID);
m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
- m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
+ if (m_process->processPool().processModel() == ProcessModelSharedSecondaryProcess)
+ m_process = m_process->processPool().ensureSharedWebProcess();
+ else
+ m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
ASSERT(m_process->state() != ChildProcessProxy::State::Terminated);
if (m_process->state() == ChildProcessProxy::State::Running)
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -102,6 +102,8 @@
namespace WebKit {
+static const double sharedSecondaryProcessShutdownTimeout = 60;
+
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, processPoolCounter, ("WebProcessPool"));
Ref<WebProcessPool> WebProcessPool::create(API::ProcessPoolConfiguration& configuration)
@@ -279,6 +281,17 @@
m_downloadClient = WTF::move(downloadClient);
}
+void WebProcessPool::setProcessModel(ProcessModel processModel)
+{
+ // Guard against API misuse.
+ if (!m_processes.isEmpty())
+ CRASH();
+ if (processModel != ProcessModelSharedSecondaryProcess && !m_messagesToInjectedBundlePostedToEmptyContext.isEmpty())
+ CRASH();
+
+ m_configuration->setProcessModel(processModel);
+}
+
void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)
{
// Guard against API misuse.
@@ -508,6 +521,14 @@
m_processWithPageCache = process;
}
+WebProcessProxy& WebProcessPool::ensureSharedWebProcess()
+{
+ ASSERT(processModel() == ProcessModelSharedSecondaryProcess);
+ if (m_processes.isEmpty())
+ createNewWebProcess();
+ return *m_processes[0];
+}
+
WebProcessProxy& WebProcessPool::createNewWebProcess()
{
ensureNetworkProcess();
@@ -574,7 +595,7 @@
// iconDatabasePath is non-empty by default, but m_iconDatabase isn't enabled in UI process unless setDatabasePath is called explicitly.
parameters.iconDatabaseEnabled = !iconDatabasePath().isEmpty();
- parameters.terminationTimeout = 0;
+ parameters.terminationTimeout = (processModel() == ProcessModelSharedSecondaryProcess) ? sharedSecondaryProcessShutdownTimeout : 0;
parameters.textCheckerState = TextChecker::state();
@@ -630,8 +651,16 @@
m_processes.append(process.ptr());
- ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
+ if (processModel() == ProcessModelSharedSecondaryProcess) {
+ for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
+ auto& messageNameAndBody = m_messagesToInjectedBundlePostedToEmptyContext[i];
+ process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageNameAndBody.first, UserData(process->transformObjectsToHandles(messageNameAndBody.second.get()).get())), 0);
+ }
+ m_messagesToInjectedBundlePostedToEmptyContext.clear();
+ } else
+ ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
+
#if ENABLE(REMOTE_INSPECTOR)
// Initialize remote inspector connection now that we have a sub-process that is hosting one of our web views.
Inspector::RemoteInspector::singleton();
@@ -712,14 +741,30 @@
if (m_haveInitialEmptyProcess && process == m_processes.last())
m_haveInitialEmptyProcess = false;
- // FIXME (Multi-WebProcess): <rdar://problem/12239765> Some of the invalidation calls of the other supplements are still necessary in multi-process mode, but they should only affect data structures pertaining to the process being disconnected.
+ // FIXME (Multi-WebProcess): <rdar://problem/12239765> Some of the invalidation calls below are still necessary in multi-process mode, but they should only affect data structures pertaining to the process being disconnected.
// Clearing everything causes assertion failures, so it's less trouble to skip that for now.
+ if (processModel() != ProcessModelSharedSecondaryProcess) {
+ RefPtr<WebProcessProxy> protect(process);
+ if (m_processWithPageCache == process)
+ m_processWithPageCache = 0;
+
+ static_cast<WebContextSupplement*>(supplement<WebGeolocationManagerProxy>())->processDidClose(process);
+
+ m_processes.removeFirst(process);
+ return;
+ }
+
+ WebContextSupplementMap::const_iterator it = m_supplements.begin();
+ WebContextSupplementMap::const_iterator end = m_supplements.end();
+ for (; it != end; ++it)
+ it->value->processDidClose(process);
+
+ // The vector may have the last reference to process proxy, which in turn may have the last reference to the context.
+ // Since vector elements are destroyed in place, we would recurse into WebProcessProxy destructor
+ // if it were invoked from Vector::remove(). RefPtr delays destruction until it's safe.
RefPtr<WebProcessProxy> protect(process);
if (m_processWithPageCache == process)
m_processWithPageCache = nullptr;
-
- static_cast<WebContextSupplement*>(supplement<WebGeolocationManagerProxy>())->processDidClose(process);
-
m_processes.removeFirst(process);
}
@@ -751,14 +796,18 @@
}
RefPtr<WebProcessProxy> process;
- if (m_haveInitialEmptyProcess) {
- process = m_processes.last();
- m_haveInitialEmptyProcess = false;
- } else if (pageConfiguration->relatedPage()) {
- // Sharing processes, e.g. when creating the page via window.open().
- process = &pageConfiguration->relatedPage()->process();
- } else
- process = &createNewWebProcessRespectingProcessCountLimit();
+ if (processModel() == ProcessModelSharedSecondaryProcess) {
+ process = &ensureSharedWebProcess();
+ } else {
+ if (m_haveInitialEmptyProcess) {
+ process = m_processes.last();
+ m_haveInitialEmptyProcess = false;
+ } else if (pageConfiguration->relatedPage()) {
+ // Sharing processes, e.g. when creating the page via window.open().
+ process = &pageConfiguration->relatedPage()->process();
+ } else
+ process = &createNewWebProcessRespectingProcessCountLimit();
+ }
return process->createWebPage(pageClient, WTF::move(pageConfiguration));
}
@@ -795,6 +844,12 @@
void WebProcessPool::postMessageToInjectedBundle(const String& messageName, API::Object* messageBody)
{
+ if (m_processes.isEmpty()) {
+ if (processModel() == ProcessModelSharedSecondaryProcess)
+ m_messagesToInjectedBundlePostedToEmptyContext.append(std::make_pair(messageName, messageBody));
+ return;
+ }
+
for (auto& process : m_processes) {
// FIXME: Return early if the message body contains any references to WKPageRefs/WKFrameRefs etc. since they're local to a process.
process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageName, UserData(process->transformObjectsToHandles(messageBody).get())), 0);
@@ -1102,7 +1157,17 @@
void WebProcessPool::requestWebContentStatistics(StatisticsRequest* request)
{
- // FIXME (Multi-WebProcess) <rdar://problem/13200059>: Make getting statistics from multiple WebProcesses work.
+ if (processModel() == ProcessModelSharedSecondaryProcess) {
+ if (m_processes.isEmpty())
+ return;
+
+ uint64_t requestID = request->addOutstandingRequest();
+ m_statisticsRequests.set(requestID, request);
+ m_processes[0]->send(Messages::WebProcess::GetWebCoreStatistics(requestID), 0);
+
+ } else {
+ // FIXME (Multi-WebProcess) <rdar://problem/13200059>: Make getting statistics from multiple WebProcesses work.
+ }
}
void WebProcessPool::requestNetworkingStatistics(StatisticsRequest* request)
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.h (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.h 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.h 2015-12-06 22:23:40 UTC (rev 193596)
@@ -37,6 +37,7 @@
#include "NetworkProcessProxy.h"
#include "PlugInAutoStartProvider.h"
#include "PluginInfoStore.h"
+#include "ProcessModel.h"
#include "ProcessThrottler.h"
#include "StatisticsRequest.h"
#include "VisitedLinkStore.h"
@@ -135,6 +136,9 @@
void setHistoryClient(std::unique_ptr<API::LegacyContextHistoryClient>);
void setDownloadClient(std::unique_ptr<API::DownloadClient>);
+ void setProcessModel(ProcessModel); // Can only be called when there are no processes running.
+ ProcessModel processModel() const { return m_configuration->processModel(); }
+
void setMaximumNumberOfProcesses(unsigned); // Can only be called when there are no processes running.
unsigned maximumNumberOfProcesses() const { return !m_configuration->maximumProcessCount() ? UINT_MAX : m_configuration->maximumProcessCount(); }
@@ -241,6 +245,7 @@
void allowSpecificHTTPSCertificateForHost(const WebCertificateInfo*, const String& host);
+ WebProcessProxy& ensureSharedWebProcess();
WebProcessProxy& createNewWebProcessRespectingProcessCountLimit(); // Will return an existing one if limit is met.
void warmInitialProcess();
@@ -553,12 +558,17 @@
void WebProcessPool::sendToAllProcessesRelaunchingThemIfNecessary(const T& message)
{
// FIXME (Multi-WebProcess): WebProcessPool doesn't track processes that have exited, so it cannot relaunch these. Perhaps this functionality won't be needed in this mode.
+ if (processModel() == ProcessModelSharedSecondaryProcess)
+ ensureSharedWebProcess();
sendToAllProcesses(message);
}
template<typename T>
void WebProcessPool::sendToOneProcess(T&& message)
{
+ if (processModel() == ProcessModelSharedSecondaryProcess)
+ ensureSharedWebProcess();
+
bool messageSent = false;
size_t processCount = m_processes.size();
for (size_t i = 0; i < processCount; ++i) {
@@ -570,7 +580,7 @@
}
}
- if (!messageSent) {
+ if (!messageSent && processModel() == ProcessModelMultipleSecondaryProcesses) {
warmInitialProcess();
RefPtr<WebProcessProxy> process = m_processes.last();
if (process->canSendMessage())
Modified: tags/Safari-602.1.13.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-06 22:23:40 UTC (rev 193596)
@@ -1450,6 +1450,7 @@
BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */; };
BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */; };
BC575613126E0138006F0F12 /* APIError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575612126E0138006F0F12 /* APIError.cpp */; };
+ BC597075116591D000551FCA /* ProcessModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC597074116591D000551FCA /* ProcessModel.h */; };
BC5C75C814954DA600BC4775 /* WKConnectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */; };
BC5D24A116CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
BC5D24A216CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
@@ -3698,6 +3699,7 @@
BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenuProxyMac.h; sourceTree = "<group>"; };
BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPopupMenuProxyMac.mm; sourceTree = "<group>"; };
BC575612126E0138006F0F12 /* APIError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIError.cpp; sourceTree = "<group>"; };
+ BC597074116591D000551FCA /* ProcessModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessModel.h; sourceTree = "<group>"; };
BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKConnectionInternal.h; sourceTree = "<group>"; };
BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessMain.mm; sourceTree = "<group>"; };
BC5D24B816CC40BB007D5461 /* BaseLegacyProcess.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseLegacyProcess.xcconfig; sourceTree = "<group>"; };
@@ -6190,6 +6192,7 @@
1AC7537A183A9FDB0072CB15 /* PageLoadState.h */,
37716A59195B910500EE8B1B /* ProcessAssertion.cpp */,
86F9536018FF4FD4001DB2EF /* ProcessAssertion.h */,
+ BC597074116591D000551FCA /* ProcessModel.h */,
86E67A22190F411800004AB7 /* ProcessThrottler.cpp */,
86E67A21190F411800004AB7 /* ProcessThrottler.h */,
83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */,
@@ -7925,6 +7928,7 @@
E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */,
86F9536518FF58F5001DB2EF /* ProcessAssertion.h in Headers */,
BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */,
+ BC597075116591D000551FCA /* ProcessModel.h in Headers */,
86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */,
83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */,
2D7F13101A702FBA009A6FBD /* ProcessType.h in Headers */,
Modified: tags/Safari-602.1.13.1/Tools/ChangeLog (193595 => 193596)
--- tags/Safari-602.1.13.1/Tools/ChangeLog 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Tools/ChangeLog 2015-12-06 22:23:40 UTC (rev 193596)
@@ -1,3 +1,7 @@
+2015-12-06 Babak Shafiei <bshaf...@apple.com>
+
+ Roll out r192808.
+
2015-12-01 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r192914.
Modified: tags/Safari-602.1.13.1/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -250,7 +250,6 @@
TEST(WebKit2, GeolocationTransitionToHighAccuracy)
{
WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
- WKContextSetMaximumNumberOfProcesses(context.get(), 1);
GeolocationTransitionToHighAccuracyStateTracker stateTracker;
setupGeolocationProvider(context.get(), &stateTracker);
@@ -315,7 +314,6 @@
TEST(WebKit2, GeolocationTransitionToLowAccuracy)
{
WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
- WKContextSetMaximumNumberOfProcesses(context.get(), 1);
GeolocationTransitionToLowAccuracyStateTracker stateTracker;
setupGeolocationProvider(context.get(), &stateTracker);
Modified: tags/Safari-602.1.13.1/Tools/WebKitTestRunner/TestController.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Tools/WebKitTestRunner/TestController.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Tools/WebKitTestRunner/TestController.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -403,6 +403,10 @@
m_geolocationProvider = std::make_unique<GeolocationProviderMock>(m_context.get());
+#if PLATFORM(EFL)
+ WKContextSetProcessModel(m_context.get(), kWKProcessModelSharedSecondaryProcess);
+#endif
+
if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
