- Revision
- 279796
- Author
- jer.no...@apple.com
- Date
- 2021-07-09 14:54:43 -0700 (Fri, 09 Jul 2021)
Log Message
[Cocoa] Allow the UIProcess to set logging parameters in the GPUProcess
https://bugs.webkit.org/show_bug.cgi?id=227822
Reviewed by Eric Carlson.
For release builds, logLevelString() will return an empty string. Instead, do the same thing
for GPUProcessProxy as we do for WebProcessPool: have a platform-specific initialization
function that, for Cocoa ports, reads log strings from NSUserDefaults.
Drive-by fix: Include <optional> in WKContentPicker.h to work around a unified build error.
* SourcesCocoa.txt:
* UIProcess/Cocoa/GPUProcessProxyCocoa.mm: Added.
(WebKit::GPUProcessProxy::platformInitializeGPUProcessParameters):
* UIProcess/Cocoa/WKContactPicker.h:
* UIProcess/GPU/GPUProcessProxy.cpp:
(WebKit::GPUProcessProxy::GPUProcessProxy):
(WebKit::GPUProcessProxy::platformInitializeGPUProcessParameters):
* UIProcess/GPU/GPUProcessProxy.h:
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279795 => 279796)
--- trunk/Source/WebKit/ChangeLog 2021-07-09 21:47:15 UTC (rev 279795)
+++ trunk/Source/WebKit/ChangeLog 2021-07-09 21:54:43 UTC (rev 279796)
@@ -1,3 +1,26 @@
+2021-07-09 Jer Noble <jer.no...@apple.com>
+
+ [Cocoa] Allow the UIProcess to set logging parameters in the GPUProcess
+ https://bugs.webkit.org/show_bug.cgi?id=227822
+
+ Reviewed by Eric Carlson.
+
+ For release builds, logLevelString() will return an empty string. Instead, do the same thing
+ for GPUProcessProxy as we do for WebProcessPool: have a platform-specific initialization
+ function that, for Cocoa ports, reads log strings from NSUserDefaults.
+
+ Drive-by fix: Include <optional> in WKContentPicker.h to work around a unified build error.
+
+ * SourcesCocoa.txt:
+ * UIProcess/Cocoa/GPUProcessProxyCocoa.mm: Added.
+ (WebKit::GPUProcessProxy::platformInitializeGPUProcessParameters):
+ * UIProcess/Cocoa/WKContactPicker.h:
+ * UIProcess/GPU/GPUProcessProxy.cpp:
+ (WebKit::GPUProcessProxy::GPUProcessProxy):
+ (WebKit::GPUProcessProxy::platformInitializeGPUProcessParameters):
+ * UIProcess/GPU/GPUProcessProxy.h:
+ * WebKit.xcodeproj/project.pbxproj:
+
2021-07-09 Chris Dumez <cdu...@apple.com>
Validate keys in ResourceLoadStatisticsDatabaseStore::findNotVeryPrevalentResources() before using them with HashMap
Modified: trunk/Source/WebKit/SourcesCocoa.txt (279795 => 279796)
--- trunk/Source/WebKit/SourcesCocoa.txt 2021-07-09 21:47:15 UTC (rev 279795)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2021-07-09 21:54:43 UTC (rev 279796)
@@ -395,6 +395,7 @@
UIProcess/Cocoa/DownloadProxyMapCocoa.mm
UIProcess/Cocoa/FindClient.mm
UIProcess/Cocoa/FullscreenClient.mm
+UIProcess/Cocoa/GPUProcessProxyCocoa.mm
UIProcess/Cocoa/GlobalFindInPageState.mm
UIProcess/Cocoa/IconLoadingDelegate.mm
UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm
Copied: trunk/Source/WebKit/UIProcess/Cocoa/GPUProcessProxyCocoa.mm (from rev 279795, trunk/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h) (0 => 279796)
--- trunk/Source/WebKit/UIProcess/Cocoa/GPUProcessProxyCocoa.mm (rev 0)
+++ trunk/Source/WebKit/UIProcess/Cocoa/GPUProcessProxyCocoa.mm 2021-07-09 21:54:43 UTC (rev 279796)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPUProcessProxy.h"
+
+#if ENABLE(GPU_PROCESS)
+
+#include "GPUProcessCreationParameters.h"
+
+namespace WebKit {
+
+void GPUProcessProxy::platformInitializeGPUProcessParameters(GPUProcessCreationParameters& parameters)
+{
+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
+ parameters.webCoreLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WebCoreLogging"];
+ parameters.webKitLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WebKit2Logging"];
+#endif
+}
+
+}
+
+#endif
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h (279795 => 279796)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h 2021-07-09 21:47:15 UTC (rev 279795)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h 2021-07-09 21:54:43 UTC (rev 279796)
@@ -27,6 +27,7 @@
#if HAVE(CONTACTSUI)
+#include <optional>
#include <wtf/Forward.h>
@class WKWebView;
Modified: trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp (279795 => 279796)
--- trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2021-07-09 21:47:15 UTC (rev 279795)
+++ trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2021-07-09 21:54:43 UTC (rev 279796)
@@ -170,10 +170,7 @@
parameters.dynamicMachExtensionHandles = SandboxExtension::createHandlesForMachLookup(nonBrowserServices(), std::nullopt);
#endif
-#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
- parameters.webCoreLoggingChannels = WebCore::logLevelString();
- parameters.webKitLoggingChannels = WebKit::logLevelString();
-#endif
+ platformInitializeGPUProcessParameters(parameters);
// Initialize the GPU process.
send(Messages::GPUProcess::InitializeGPUProcess(parameters), 0);
@@ -604,6 +601,16 @@
gpuProcessExited(GPUProcessTerminationReason::Unresponsive);
}
+#if !PLATFORM(COCOA)
+void GPUProcessProxy::platformInitializeGPUProcessParameters(GPUProcessCreationParameters& parameters)
+{
+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
+ parameters.webCoreLoggingChannels = WebCore::logLevelString();
+ parameters.webKitLoggingChannels = WebKit::logLevelString();
+#endif
+}
+#endif
+
} // namespace WebKit
#undef MESSAGE_CHECK
Modified: trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.h (279795 => 279796)
--- trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.h 2021-07-09 21:47:15 UTC (rev 279795)
+++ trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.h 2021-07-09 21:54:43 UTC (rev 279796)
@@ -130,6 +130,8 @@
void didCreateContextForVisibilityPropagation(WebPageProxyIdentifier, WebCore::PageIdentifier, LayerHostingContextID);
#endif
+ void platformInitializeGPUProcessParameters(GPUProcessCreationParameters&);
+
ProcessThrottler m_throttler;
ProcessThrottler::ActivityVariant m_activityFromWebProcesses;
#if ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (279795 => 279796)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-07-09 21:47:15 UTC (rev 279795)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-07-09 21:54:43 UTC (rev 279796)
@@ -5772,6 +5772,7 @@
CDAC20F423FC383A0021DEE3 /* RemoteCDMProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteCDMProxyMessages.h; sourceTree = "<group>"; };
CDAC20F523FC383B0021DEE3 /* RemoteCDMInstanceProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteCDMInstanceProxyMessageReceiver.cpp; sourceTree = "<group>"; };
CDAC20F623FC383B0021DEE3 /* RemoteCDMInstanceProxyMessagesReplies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteCDMInstanceProxyMessagesReplies.h; sourceTree = "<group>"; };
+ CDB2A1ED2697925C006B235C /* GPUProcessProxyCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUProcessProxyCocoa.mm; sourceTree = "<group>"; };
CDBB49F4240D8AC60017C292 /* RemoteAudioSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSession.h; sourceTree = "<group>"; };
CDBB49F5240D8AC60017C292 /* RemoteAudioSession.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAudioSession.cpp; sourceTree = "<group>"; };
CDBB49F6240D8C950017C292 /* RemoteAudioSessionProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteAudioSessionProxy.h; sourceTree = "<group>"; };
@@ -7056,6 +7057,7 @@
CD78E1121DB7D7ED0014A2DE /* FullscreenClient.mm */,
2E2B3BA421D4879000538EDF /* GlobalFindInPageState.h */,
2E2B3BA321D4879000538EDF /* GlobalFindInPageState.mm */,
+ CDB2A1ED2697925C006B235C /* GPUProcessProxyCocoa.mm */,
51C0C9721DDD74F00032CAD3 /* IconLoadingDelegate.h */,
51C0C9731DDD74F00032CAD3 /* IconLoadingDelegate.mm */,
7A821F4B1E2F664800604577 /* LegacyCustomProtocolManagerClient.h */,
