Title: [283478] trunk/Source/WebKit
Revision
283478
Author
[email protected]
Date
2021-10-03 14:02:20 -0700 (Sun, 03 Oct 2021)

Log Message

[PlayStation] Pass logging channel parameter to WebProcess from environment variable
https://bugs.webkit.org/show_bug.cgi?id=230726
<rdar://problem/83740947>

Reviewed by Fujii Hironori.

Added release log configuration environment variables to PlayStation port.

* UIProcess/playstation/WebProcessPoolPlayStation.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* WebProcess/playstation/WebProcessPlayStation.cpp:
(WebKit::WebProcess::platformInitializeWebProcess):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (283477 => 283478)


--- trunk/Source/WebKit/ChangeLog	2021-10-03 19:32:52 UTC (rev 283477)
+++ trunk/Source/WebKit/ChangeLog	2021-10-03 21:02:20 UTC (rev 283478)
@@ -1,3 +1,18 @@
+2021-10-03  Basuke Suzuki  <[email protected]>
+
+        [PlayStation] Pass logging channel parameter to WebProcess from environment variable
+        https://bugs.webkit.org/show_bug.cgi?id=230726
+        <rdar://problem/83740947>
+
+        Reviewed by Fujii Hironori.
+
+        Added release log configuration environment variables to PlayStation port.
+
+        * UIProcess/playstation/WebProcessPoolPlayStation.cpp:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * WebProcess/playstation/WebProcessPlayStation.cpp:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2021-10-03  David Kilzer  <[email protected]>
 
         WTF::RetainPtr<> allows assignment of two pointer types that are not assignable

Modified: trunk/Source/WebKit/UIProcess/playstation/WebProcessPoolPlayStation.cpp (283477 => 283478)


--- trunk/Source/WebKit/UIProcess/playstation/WebProcessPoolPlayStation.cpp	2021-10-03 19:32:52 UTC (rev 283477)
+++ trunk/Source/WebKit/UIProcess/playstation/WebProcessPoolPlayStation.cpp	2021-10-03 21:02:20 UTC (rev 283478)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "WebProcessPool.h"
 
+#include "WebProcessCreationParameters.h"
+
 namespace WebKit {
 
 void WebProcessPool::platformInitialize()
@@ -38,9 +40,19 @@
     notImplemented();
 }
 
-void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy&, WebProcessCreationParameters&)
+void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy&, WebProcessCreationParameters& parameters)
 {
-    notImplemented();
+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
+    char buf[2048];
+    if (getenv_np("WTFLogging", buf, sizeof(buf)))
+        parameters.wtfLoggingChannels = buf;
+    if (getenv_np("WebCoreLogging", buf, sizeof(buf)))
+        parameters.webCoreLoggingChannels = buf;
+    if (getenv_np("WebKitLogging", buf, sizeof(buf)))
+        parameters.webKitLoggingChannels = buf;
+#else
+    UNUSED_PARAM(parameters);
+#endif
 }
 
 void WebProcessPool::platformInvalidateContext()

Modified: trunk/Source/WebKit/WebProcess/playstation/WebProcessPlayStation.cpp (283477 => 283478)


--- trunk/Source/WebKit/WebProcess/playstation/WebProcessPlayStation.cpp	2021-10-03 19:32:52 UTC (rev 283477)
+++ trunk/Source/WebKit/WebProcess/playstation/WebProcessPlayStation.cpp	2021-10-03 21:02:20 UTC (rev 283478)
@@ -26,10 +26,21 @@
 #include "config.h"
 #include "WebProcess.h"
 
+#include "LogInitialization.h"
+#include <WebCore/LogInitialization.h>
+#include <wtf/LogInitialization.h>
+
 namespace WebKit {
 
-void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&)
+void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
 {
+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
+    WTF::logChannels().initializeLogChannelsIfNecessary(parameters.wtfLoggingChannels);
+    WebCore::logChannels().initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
+    WebKit::logChannels().initializeLogChannelsIfNecessary(parameters.webKitLoggingChannels);
+#else
+    UNUSED_PARAM(parameters);
+#endif
 }
 
 void WebProcess::platformSetWebsiteDataStoreParameters(WebProcessDataStoreParameters&&)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to