Attachment 373184 Details for Bug 199345 – Try again

[patch] Try again

bug199345.diff (text/plain), 5.09 KB, created by Basuke Suzuki on 2019-06-29 21:05:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2019-06-29 21:05:53 PDT

Size: 5.09 KB

patch

obsolete

>diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>index ea6a1e87fa9..31cdfbab0b6 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>@@ -162,8 +162,10 @@ void WebProcessPool::platformResolvePathsForSandboxExtensions()
> #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));
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm
>index 7babdeb6030..5c21ca75a18 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm
>@@ -170,7 +170,7 @@ void WebProcessProxy::cacheMediaMIMETypesInternal(const Vector<String>& types)
>     send(Messages::WebProcess::SetMediaMIMETypes(types), 0);
> }
> 
>-Vector<String> WebProcessProxy::mediaMIMETypes()
>+Vector<String> WebProcessProxy::mediaMIMETypes() const
> {
>     return mediaTypeCache();
> }
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index 9462799f2a8..47036b3d278 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -989,16 +989,8 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
> 
>     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)
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 57068520efa..600dae26ebf 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -529,7 +529,7 @@ public:
> 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&)>&&);
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
>index ecbc5d8fc4c..4b7ca4db62f 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.h
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
>@@ -252,7 +252,7 @@ public:
>     void markIsNoLongerInPrewarmedPool();
> 
> #if PLATFORM(COCOA)
>-    Vector<String> mediaMIMETypes();
>+    Vector<String> mediaMIMETypes() const;
>     void cacheMediaMIMETypes(const Vector<String>&);
> #endif
> 
>diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>index 992f3319a3b..4ea3ac2221e 100644
>--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>@@ -100,9 +100,11 @@ void WebProcessPool::platformInitialize()
>         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());
>diff --git a/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp b/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp
>index 390a0c90192..569e64938d4 100644
>--- a/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp
>+++ b/Source/WebKit/UIProcess/win/WebProcessPoolWin.cpp
>@@ -43,7 +43,7 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
>     notImplemented();
> }
> 
>-void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
>+void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process, WebProcessCreationParameters& parameters)
> {
>     notImplemented();
> }

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 199345: 373182 | 373184 | 373196