[webkit-changes] [289449] trunk/Source/WebKit

Tue, 08 Feb 2022 16:35:57 -0800

Title: [289449] trunk/Source/WebKit
Revision
289449
Author
[email protected]
Date
2022-02-08 16:35:21 -0800 (Tue, 08 Feb 2022)

Log Message

[Playstation] Fix build break after r289247 if ENABLE_SERVICE_WORKER is off
https://bugs.webkit.org/show_bug.cgi?id=236321

Patch by Jigen Zhou <[email protected]> on 2022-02-08
Reviewed by Chris Dumez.

Unreviewed, build fix for playstation platform after r289247 for support of sharing Shared Workers.
This patch resolves compiling errors caused by unknow type name and undeclared identifiers,
and it also fixes linking error by making methods WebProcessProxy::createForWorkers and
WebProcessPool::userContentControllerIdentifierForWorkers() available when ENABLE_SERVICE_WORKER is off

* NetworkProcess/SharedWorker/WebSharedWorkerServer.h:
* NetworkProcess/SharedWorker/WebSharedWorkerServerConnection.h:
* UIProcess/WebProcessPool.cpp:
* UIProcess/WebProcessPool.h:
* UIProcess/WebProcessProxy.cpp:
* WebProcess/Storage/WebSharedWorkerContextManagerConnection.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (289448 => 289449)


--- trunk/Source/WebKit/ChangeLog	2022-02-09 00:26:02 UTC (rev 289448)
+++ trunk/Source/WebKit/ChangeLog	2022-02-09 00:35:21 UTC (rev 289449)
@@ -1,3 +1,22 @@
+2022-02-08  Jigen Zhou  <[email protected]>
+
+        [Playstation] Fix build break after r289247 if ENABLE_SERVICE_WORKER is off
+        https://bugs.webkit.org/show_bug.cgi?id=236321
+
+        Reviewed by Chris Dumez.
+
+        Unreviewed, build fix for playstation platform after r289247 for support of sharing Shared Workers.
+        This patch resolves compiling errors caused by unknow type name and undeclared identifiers, 
+        and it also fixes linking error by making methods WebProcessProxy::createForWorkers and
+        WebProcessPool::userContentControllerIdentifierForWorkers() available when ENABLE_SERVICE_WORKER is off
+
+        * NetworkProcess/SharedWorker/WebSharedWorkerServer.h:
+        * NetworkProcess/SharedWorker/WebSharedWorkerServerConnection.h:
+        * UIProcess/WebProcessPool.cpp:
+        * UIProcess/WebProcessPool.h:
+        * UIProcess/WebProcessProxy.cpp:
+        * WebProcess/Storage/WebSharedWorkerContextManagerConnection.cpp:
+
 2022-02-08  J Pascoe  <[email protected]>
 
         [WebAuthn] Use AuthenticationServicesAgent for WebAuthn calls on iOS

Modified: trunk/Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServer.h (289448 => 289449)


--- trunk/Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServer.h	2022-02-09 00:26:02 UTC (rev 289448)
+++ trunk/Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServer.h	2022-02-09 00:35:21 UTC (rev 289449)
@@ -32,6 +32,10 @@
 #include <WebCore/TransferredMessagePort.h>
 #include <wtf/WeakPtr.h>
 
+namespace PAL {
+class SessionID;
+}
+
 namespace WebCore {
 class RegistrableDomain;

Modified: trunk/Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServerConnection.h (289448 => 289449)


--- trunk/Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServerConnection.h	2022-02-09 00:26:02 UTC (rev 289448)
+++ trunk/Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServerConnection.h	2022-02-09 00:35:21 UTC (rev 289449)
@@ -43,6 +43,7 @@
 class WebSharedWorker;
 class WebSharedWorkerServer;
 class WebSharedWorkerServerToContextConnection;
+class NetworkSession;
 
 class WebSharedWorkerServerConnection : public IPC::MessageSender, public IPC::MessageReceiver {
     WTF_MAKE_FAST_ALLOCATED;

Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (289448 => 289449)


--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2022-02-09 00:26:02 UTC (rev 289448)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2022-02-09 00:35:21 UTC (rev 289449)
@@ -1114,7 +1114,6 @@
     return createNewWebProcess(&websiteDataStore, captivePortalMode);
 }
 
-#if ENABLE(SERVICE_WORKER)
 UserContentControllerIdentifier WebProcessPool::userContentControllerIdentifierForWorkers()
 {
     if (!m_userContentControllerForWorkers)
@@ -1122,7 +1121,6 @@
 
     return m_userContentControllerForWorkers->identifier();
 }
-#endif
 
 Ref<WebPageProxy> WebProcessPool::createWebPage(PageClient& pageClient, Ref<API::PageConfiguration>&& pageConfiguration)
 {

Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (289448 => 289449)


--- trunk/Source/WebKit/UIProcess/WebProcessPool.h	2022-02-09 00:26:02 UTC (rev 289448)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h	2022-02-09 00:35:21 UTC (rev 289449)
@@ -379,7 +379,6 @@
 #if ENABLE(SERVICE_WORKER)
     static void establishServiceWorkerContextConnectionToNetworkProcess(WebCore::RegistrableDomain&&, std::optional<WebCore::ScriptExecutionContextIdentifier> serviceWorkerPageIdentifier, PAL::SessionID, CompletionHandler<void()>&&);
     size_t serviceWorkerProxiesCount() const;
-    UserContentControllerIdentifier userContentControllerIdentifierForWorkers();
     bool hasServiceWorkerForegroundActivityForTesting() const;
     bool hasServiceWorkerBackgroundActivityForTesting() const;
 #endif
@@ -386,6 +385,7 @@
     void serviceWorkerProcessCrashed(WebProcessProxy&);
 
     void updateWorkerUserAgent(const String& userAgent);
+    UserContentControllerIdentifier userContentControllerIdentifierForWorkers();
     static void establishSharedWorkerContextConnectionToNetworkProcess(WebCore::RegistrableDomain&&, PAL::SessionID, CompletionHandler<void()>&&);
 
 #if PLATFORM(COCOA)

Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (289448 => 289449)


--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp	2022-02-09 00:26:02 UTC (rev 289448)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp	2022-02-09 00:35:21 UTC (rev 289449)
@@ -182,7 +182,6 @@
     return proxy;
 }
 
-#if ENABLE(SERVICE_WORKER)
 Ref<WebProcessProxy> WebProcessProxy::createForWorkers(WorkerType workerType, WebProcessPool& processPool, RegistrableDomain&& registrableDomain, WebsiteDataStore& websiteDataStore)
 {
     auto proxy = adoptRef(*new WebProcessProxy(processPool, &websiteDataStore, IsPrewarmed::No, CrossOriginMode::Shared, CaptivePortalMode::Disabled));
@@ -191,7 +190,6 @@
     proxy->connect();
     return proxy;
 }
-#endif
 
 #if PLATFORM(COCOA) && ENABLE(MEDIA_STREAM)
 class UIProxyForCapture final : public UserMediaCaptureManagerProxy::ConnectionProxy {

Modified: trunk/Source/WebKit/WebProcess/Storage/WebSharedWorkerContextManagerConnection.cpp (289448 => 289449)


--- trunk/Source/WebKit/WebProcess/Storage/WebSharedWorkerContextManagerConnection.cpp	2022-02-09 00:26:02 UTC (rev 289448)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSharedWorkerContextManagerConnection.cpp	2022-02-09 00:35:21 UTC (rev 289449)
@@ -59,7 +59,7 @@
 #if PLATFORM(COCOA)
     , m_userAgent(WebCore::standardUserAgentWithApplicationName({ }))
 #else
-    , m_userAgent(standardUserAgent())
+    , m_userAgent(WebCore::standardUserAgent())
 #endif
     , m_userContentController(WebUserContentController::getOrCreate(initializationData.userContentControllerIdentifier))
 {

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to