<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277835] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277835">277835</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2021-05-20 16:06:01 -0700 (Thu, 20 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Allow GPU process log channels to be configured
https://bugs.webkit.org/show_bug.cgi?id=226036
<rdar://problem/78271211>

Reviewed by Jer Noble.

* GPUProcess/GPUConnectionToWebProcess.cpp:
(WebKit::GPUConnectionToWebProcess::configureLoggingChannel): Configure WebCore and
WebKit logging channels because classes used in the GPU process use both.
* GPUProcess/GPUConnectionToWebProcess.h:
* GPUProcess/GPUConnectionToWebProcess.messages.in:

* WebProcess/GPU/GPUProcessConnection.cpp:
(WebKit::GPUProcessConnection::configureLoggingChannel): Send configureLoggingChannel
message to the GPU process.
* WebProcess/GPU/GPUProcessConnection.h:

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::configureLoggingChannel): Send configureLoggingChannel to the
GPU process connection, if there is one.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitGPUProcessGPUConnectionToWebProcesscpp">trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKitGPUProcessGPUConnectionToWebProcessh">trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h</a></li>
<li><a href="#trunkSourceWebKitGPUProcessGPUConnectionToWebProcessmessagesin">trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUGPUProcessConnectioncpp">trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUGPUProcessConnectionh">trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPagecpp">trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (277834 => 277835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-05-20 23:03:12 UTC (rev 277834)
+++ trunk/Source/WebKit/ChangeLog       2021-05-20 23:06:01 UTC (rev 277835)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2021-05-20  Eric Carlson  <eric.carlson@apple.com>
+
+        Allow GPU process log channels to be configured
+        https://bugs.webkit.org/show_bug.cgi?id=226036
+        <rdar://problem/78271211>
+
+        Reviewed by Jer Noble.
+
+        * GPUProcess/GPUConnectionToWebProcess.cpp:
+        (WebKit::GPUConnectionToWebProcess::configureLoggingChannel): Configure WebCore and
+        WebKit logging channels because classes used in the GPU process use both.
+        * GPUProcess/GPUConnectionToWebProcess.h:
+        * GPUProcess/GPUConnectionToWebProcess.messages.in:
+
+        * WebProcess/GPU/GPUProcessConnection.cpp:
+        (WebKit::GPUProcessConnection::configureLoggingChannel): Send configureLoggingChannel
+        message to the GPU process.
+        * WebProcess/GPU/GPUProcessConnection.h:
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::configureLoggingChannel): Send configureLoggingChannel to the 
+        GPU process connection, if there is one.
+
</ins><span class="cx"> 2021-05-20  Brent Fulgham  <bfulgham@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Adopt "com.apple.QuartzCore.webkit-limited-types" entitlement
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessGPUConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp (277834 => 277835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp     2021-05-20 23:03:12 UTC (rev 277834)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp        2021-05-20 23:06:01 UTC (rev 277835)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebErrors.h"
</span><span class="cx"> #include "WebProcessMessages.h"
</span><ins>+#include <WebCore/Logging.h>
</ins><span class="cx"> #include <WebCore/MockRealtimeMediaSourceCenter.h>
</span><span class="cx"> #include <WebCore/NowPlayingManager.h>
</span><span class="cx"> #include <wtf/Language.h>
</span><span class="lines">@@ -278,6 +279,27 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+void GPUConnectionToWebProcess::configureLoggingChannel(const String& channelName, WTFLogChannelState state, WTFLogLevel level)
+{
+#if !RELEASE_LOG_DISABLED
+    if  (auto* channel = WebCore::getLogChannel(channelName)) {
+        channel->state = state;
+        channel->level = level;
+    }
+
+    auto* channel = getLogChannel(channelName);
+    if  (!channel)
+        return;
+
+    channel->state = state;
+    channel->level = level;
+#else
+    UNUSED_PARAM(channelName);
+    UNUSED_PARAM(state);
+    UNUSED_PARAM(level);
+#endif
+}
+
</ins><span class="cx"> bool GPUConnectionToWebProcess::allowsExitUnderMemoryPressure() const
</span><span class="cx"> {
</span><span class="cx">     for (auto& remoteRenderingBackend : m_remoteRenderingBackendMap.values()) {
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessGPUConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h (277834 => 277835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h       2021-05-20 23:03:12 UTC (rev 277834)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h  2021-05-20 23:06:01 UTC (rev 277835)
</span><span class="lines">@@ -201,6 +201,7 @@
</span><span class="cx">     void releaseRemoteCommandListener(RemoteRemoteCommandListenerIdentifier);
</span><span class="cx">     void setMediaOverridesForTesting(MediaOverridesForTesting);
</span><span class="cx">     void setUserPreferredLanguages(const Vector<String>&);
</span><ins>+    void configureLoggingChannel(const String&, WTFLogChannelState, WTFLogLevel);
</ins><span class="cx"> 
</span><span class="cx">     // IPC::Connection::Client
</span><span class="cx">     void didClose(IPC::Connection&) final;
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessGPUConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in (277834 => 277835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in     2021-05-20 23:03:12 UTC (rev 277834)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in        2021-05-20 23:06:01 UTC (rev 277835)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx">     CreateRemoteCommandListener(WebKit::RemoteRemoteCommandListenerIdentifier identifier)
</span><span class="cx">     ReleaseRemoteCommandListener(WebKit::RemoteRemoteCommandListenerIdentifier identifier)
</span><span class="cx">     SetUserPreferredLanguages(Vector<String> languages)
</span><ins>+    ConfigureLoggingChannel(String channelName, enum:uint8_t WTFLogChannelState state, enum:uint8_t WTFLogLevel level)
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(GPU_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUGPUProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp (277834 => 277835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp      2021-05-20 23:03:12 UTC (rev 277834)
+++ trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp 2021-05-20 23:06:01 UTC (rev 277835)
</span><span class="lines">@@ -245,6 +245,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+void GPUProcessConnection::configureLoggingChannel(const String& channelName, WTFLogChannelState state, WTFLogLevel level)
+{
+    connection().send(Messages::GPUConnectionToWebProcess::ConfigureLoggingChannel(channelName, state, level), { });
+}
+
</ins><span class="cx"> #if ENABLE(VP9)
</span><span class="cx"> void GPUProcessConnection::enableVP9Decoders(bool enableVP8Decoder, bool enableVP9Decoder, bool enableVP9SWDecoder)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUGPUProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.h (277834 => 277835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.h        2021-05-20 23:03:12 UTC (rev 277834)
+++ trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.h   2021-05-20 23:06:01 UTC (rev 277835)
</span><span class="lines">@@ -85,6 +85,8 @@
</span><span class="cx">     void destroyVisibilityPropagationContextForPage(WebPage&);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    void configureLoggingChannel(const String&, WTFLogChannelState, WTFLogLevel);
+
</ins><span class="cx">     class Client : public CanMakeWeakPtr<Client> {
</span><span class="cx">     public:
</span><span class="cx">         virtual ~Client() = default;
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (277834 => 277835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp       2021-05-20 23:03:12 UTC (rev 277834)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp  2021-05-20 23:06:01 UTC (rev 277835)
</span><span class="lines">@@ -7263,6 +7263,11 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPage::configureLoggingChannel(const String& channelName, WTFLogChannelState state, WTFLogLevel level)
</span><span class="cx"> {
</span><ins>+#if ENABLE(GPU_PROCESS)
+    if (auto* gpuProcessConnection = WebProcess::singleton().existingGPUProcessConnection())
+        gpuProcessConnection->configureLoggingChannel(channelName, state, level);
+#endif
+
</ins><span class="cx">     send(Messages::WebPageProxy::ConfigureLoggingChannel(channelName, state, level));
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>