Diff
Modified: trunk/Source/WebKit/ChangeLog (246954 => 246955)
--- trunk/Source/WebKit/ChangeLog 2019-06-30 14:02:40 UTC (rev 246954)
+++ trunk/Source/WebKit/ChangeLog 2019-06-30 21:59:19 UTC (rev 246955)
@@ -1,3 +1,23 @@
+2019-06-30 Basuke Suzuki <[email protected]>
+
+ Pass WebProcess information to platformInitializeWebProcess().
+ https://bugs.webkit.org/show_bug.cgi?id=199345
+
+ Reviewed by Darin Adler.
+
+ Add const reference to WebProcessProxy for first argument of
+ WebProcessPool::platformInitializeWebProcess().
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::initializeNewWebProcess):
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/glib/WebProcessPoolGLib.cpp:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * UIProcess/win/WebProcessPoolWin.cpp:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+
2019-06-28 Brent Fulgham <[email protected]>
Revise WebContent sandbox based on seed feedback
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (246954 => 246955)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2019-06-30 14:02:40 UTC (rev 246954)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2019-06-30 21:59:19 UTC (rev 246955)
@@ -162,8 +162,10 @@
#endif
}
-void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
+void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process, WebProcessCreationParameters& parameters)
{
+ parameters.mediaMIMETypes = process.mediaMIMETypes();
+
#if PLATFORM(MAC)
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (246954 => 246955)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2019-06-30 14:02:40 UTC (rev 246954)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2019-06-30 21:59:19 UTC (rev 246955)
@@ -170,7 +170,7 @@
send(Messages::WebProcess::SetMediaMIMETypes(types), 0);
}
-Vector<String> WebProcessProxy::mediaMIMETypes()
+Vector<String> WebProcessProxy::mediaMIMETypes() const
{
return mediaTypeCache();
}
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (246954 => 246955)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-06-30 14:02:40 UTC (rev 246954)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-06-30 21:59:19 UTC (rev 246955)
@@ -989,16 +989,8 @@
parameters.presentingApplicationPID = m_configuration->presentingApplicationPID();
-#if PLATFORM(COCOA)
- parameters.mediaMIMETypes = process.mediaMIMETypes();
-#endif
-
-#if PLATFORM(WPE)
- parameters.isServiceWorkerProcess = process.isServiceWorkerProcess();
-#endif
-
// Add any platform specific parameters
- platformInitializeWebProcess(parameters);
+ platformInitializeWebProcess(process, parameters);
RefPtr<API::Object> injectedBundleInitializationUserData = m_injectedBundleClient->getInjectedBundleInitializationUserData(*this);
if (!injectedBundleInitializationUserData)
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (246954 => 246955)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-06-30 14:02:40 UTC (rev 246954)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-06-30 21:59:19 UTC (rev 246955)
@@ -529,7 +529,7 @@
private:
void platformInitialize();
- void platformInitializeWebProcess(WebProcessCreationParameters&);
+ void platformInitializeWebProcess(const WebProcessProxy&, WebProcessCreationParameters&);
void platformInvalidateContext();
void processForNavigationInternal(WebPageProxy&, const API::Navigation&, Ref<WebProcessProxy>&& sourceProcess, const URL& sourceURL, ProcessSwapRequestedByClient, Ref<WebsiteDataStore>&&, CompletionHandler<void(Ref<WebProcessProxy>&&, SuspendedPageProxy*, const String&)>&&);
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.h (246954 => 246955)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2019-06-30 14:02:40 UTC (rev 246954)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2019-06-30 21:59:19 UTC (rev 246955)
@@ -252,7 +252,7 @@
void markIsNoLongerInPrewarmedPool();
#if PLATFORM(COCOA)
- Vector<String> mediaMIMETypes();
+ Vector<String> mediaMIMETypes() const;
void cacheMediaMIMETypes(const Vector<String>&);
#endif
Modified: trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (246954 => 246955)
--- trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-06-30 14:02:40 UTC (rev 246954)
+++ trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-06-30 21:59:19 UTC (rev 246955)
@@ -100,9 +100,11 @@
installMemoryPressureHandler();
}
-void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
+void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process, WebProcessCreationParameters& parameters)
{
#if PLATFORM(WPE)
+ parameters.isServiceWorkerProcess = process.isServiceWorkerProcess();
+
if (!parameters.isServiceWorkerProcess) {
parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
Modified: trunk/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp (246954 => 246955)
--- trunk/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp 2019-06-30 14:02:40 UTC (rev 246954)
+++ trunk/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp 2019-06-30 21:59:19 UTC (rev 246955)
@@ -43,7 +43,7 @@
notImplemented();
}
-void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
+void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy&, WebProcessCreationParameters&)
{
notImplemented();
}
