Cherry-pick ce1ce90. rdar://123356564

GPU resources in the WebContent process should be accessible in some configurations https://bugs.webkit.org/show_bug.cgi?id=269851 rdar://123356564 Reviewed by Brent Fulgham. For some configurations, we still need to have access to GPU resources in the WebContent process. * Source/WTF/wtf/PlatformEnableCocoa.h: * Source/WebKit/WebProcess/com.apple.WebProcess.sb.in: Canonical link: https://commits.webkit.org/275126@main Identifier: 273664.1283@safari-7619.1.5-branch
WebKit · Feb 21, 2024 · 630c7f8 · 630c7f8
1 parent d5ae5f5
commit 630c7f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h
@@ -928,8 +928,7 @@
 #endif
 
 #if !defined(ENABLE_WEBCONTENT_GPU_SANDBOX_EXTENSIONS_BLOCKING) \
-    && ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000) \
-    || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140400))
+    && ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000))
 #define ENABLE_WEBCONTENT_GPU_SANDBOX_EXTENSIONS_BLOCKING 1
 #endif
 

diff --git a/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in b/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in
@@ -30,8 +30,8 @@
 #define FALSE #f
 
 (define (webcontent_gpu_sandbox_extensions_blocking)
-#if ENABLE(WEBCONTENT_GPU_SANDBOX_EXTENSIONS_BLOCKING)
-    (equal? (param "CPU") "arm64")
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140400
+    (and (equal? (param "CPU") "arm64") (not (uid 0)))
 #else
     FALSE
 #endif