Cherry-pick 638c7e3. rdar://123336279

Fix layout tests in simulator after https://commits.webkit.org/274822@main https://bugs.webkit.org/show_bug.cgi?id=269800 rdar://123322718 Reviewed by Brent Fulgham. Entitlement changes related to process grants are required for simulator after <https://commits.webkit.org/274822@main>. * Source/WebKit/Configurations/BaseExtension.xcconfig: * Source/WebKit/Configurations/GPUExtension.xcconfig: * Source/WebKit/Configurations/NetworkingExtension.xcconfig: * Source/WebKit/Configurations/WebContentCaptivePortalExtension.xcconfig: * Source/WebKit/Configurations/WebContentExtension.xcconfig: * Source/WebKit/Shared/AuxiliaryProcessExtensions/GPUProcessExtension.entitlements: Copied from Source/WebKit/Shared/AuxiliaryProcessExtensions/AuxiliaryProcessExtension.entitlements. * Source/WebKit/Shared/AuxiliaryProcessExtensions/NetworkingProcessExtension.entitlements: Copied from Source/WebKit/Shared/AuxiliaryProcessExtensions/AuxiliaryProcessExtension.entitlements. * Source/WebKit/Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements: Renamed from Source/WebKit/Shared/AuxiliaryProcessExtensions/AuxiliaryProcessExtension.entitlements. * Source/WebKit/WebKit.xcodeproj/project.pbxproj: Canonical link: https://commits.webkit.org/275072@main Identifier: 272448.681@safari-7618-branch
WebKit · Mar 5, 2024 · b6aa90d · b6aa90d
1 parent f6e1961
commit b6aa90d
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 3 deletions.
diff --git a/Source/WebKit/Configurations/BaseExtension.xcconfig b/Source/WebKit/Configurations/BaseExtension.xcconfig
@@ -57,9 +57,6 @@ EXCLUDED_SOURCE_FILE_NAMES_YES[sdk=xr*] = *;
 
 CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 
-// For simulator builds, entitlements are added to a special __entitlements section on the binary rather than the signature.
-CODE_SIGN_ENTITLEMENTS[sdk=*simulator] = Shared/AuxiliaryProcessExtensions/AuxiliaryProcessExtension.entitlements;
-
 WK_PROCESSED_XCENT_FILE=$(TEMP_FILE_DIR)/$(FULL_PRODUCT_NAME).entitlements
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS = --entitlements $(WK_PROCESSED_XCENT_FILE);
 

diff --git a/Source/WebKit/Configurations/GPUExtension.xcconfig b/Source/WebKit/Configurations/GPUExtension.xcconfig
@@ -28,3 +28,6 @@ INFOPLIST_KEY_CFBundleDisplayName = GPUExtension;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.WebKit.GPU;
 EXECUTABLE_NAME = $(PRODUCT_BUNDLE_IDENTIFIER);
 PRODUCT_BUNDLE_NAME = GPUExtension;
+
+// For simulator builds, entitlements are added to a special __entitlements section on the binary rather than the signature.
+CODE_SIGN_ENTITLEMENTS[sdk=*simulator] = Shared/AuxiliaryProcessExtensions/GPUProcessExtension.entitlements;
diff --git a/Source/WebKit/Configurations/NetworkingExtension.xcconfig b/Source/WebKit/Configurations/NetworkingExtension.xcconfig
@@ -28,3 +28,6 @@ INFOPLIST_KEY_CFBundleDisplayName = NetworkingExtension;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.WebKit.Networking;
 EXECUTABLE_NAME = $(PRODUCT_BUNDLE_IDENTIFIER);
 PRODUCT_BUNDLE_NAME = NetworkingExtension;
+
+// For simulator builds, entitlements are added to a special __entitlements section on the binary rather than the signature.
+CODE_SIGN_ENTITLEMENTS[sdk=*simulator] = Shared/AuxiliaryProcessExtensions/NetworkingProcessExtension.entitlements;
diff --git a/Source/WebKit/Configurations/WebContentCaptivePortalExtension.xcconfig b/Source/WebKit/Configurations/WebContentCaptivePortalExtension.xcconfig
@@ -28,3 +28,6 @@ INFOPLIST_KEY_CFBundleDisplayName = WebContentCaptivePortalExtension;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.WebKit.WebContent.CaptivePortal;
 EXECUTABLE_NAME = $(PRODUCT_BUNDLE_IDENTIFIER);
 PRODUCT_BUNDLE_NAME = WebContentCaptivePortalExtension;
+
+// For simulator builds, entitlements are added to a special __entitlements section on the binary rather than the signature.
+CODE_SIGN_ENTITLEMENTS[sdk=*simulator] = Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements;
diff --git a/Source/WebKit/Configurations/WebContentExtension.xcconfig b/Source/WebKit/Configurations/WebContentExtension.xcconfig
@@ -28,3 +28,6 @@ INFOPLIST_KEY_CFBundleDisplayName = WebContentExtension;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.WebKit.WebContent;
 EXECUTABLE_NAME = $(PRODUCT_BUNDLE_IDENTIFIER);
 PRODUCT_BUNDLE_NAME = WebContentExtension;
+
+// For simulator builds, entitlements are added to a special __entitlements section on the binary rather than the signature.
+CODE_SIGN_ENTITLEMENTS[sdk=*simulator] = Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements;
diff --git a/...ns/AuxiliaryProcessExtension.entitlements → ...tensions/GPUProcessExtension.entitlements b/...ns/AuxiliaryProcessExtension.entitlements → ...tensions/GPUProcessExtension.entitlements
@@ -6,6 +6,8 @@
 	<true/>
 	<key>com.apple.private.webkit.use-xpc-endpoint</key>
 	<true/>
+	<key>com.apple.developer.web-browser-engine.rendering</key>
+	<true/>
 	<key>com.apple.private.extensionkit.host-requirement-exemption</key>
 	<true/>
 </dict>

diff --git a/Source/WebKit/Shared/AuxiliaryProcessExtensions/NetworkingProcessExtension.entitlements b/Source/WebKit/Shared/AuxiliaryProcessExtensions/NetworkingProcessExtension.entitlements
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.runningboard.assertions.webkit</key>
+	<true/>
+	<key>com.apple.private.webkit.use-xpc-endpoint</key>
+	<true/>
+	<key>com.apple.developer.web-browser-engine.networking</key>
+	<true/>
+	<key>com.apple.private.extensionkit.host-requirement-exemption</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Source/WebKit/Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements b/Source/WebKit/Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.runningboard.assertions.webkit</key>
+	<true/>
+	<key>com.apple.private.webkit.use-xpc-endpoint</key>
+	<true/>
+	<key>com.apple.developer.web-browser-engine.webcontent</key>
+	<true/>
+	<key>com.apple.private.extensionkit.host-requirement-exemption</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -7629,6 +7629,9 @@
 		E36D701D27B718EF006531B7 /* WebAttachmentElementClient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebAttachmentElementClient.cpp; sourceTree = "<group>"; };
 		E36FF00127F36FBD004BE21A /* SandboxStateVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxStateVariables.h; sourceTree = "<group>"; };
 		E36FF00227F36FBD004BE21A /* preferences.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = preferences.sb; sourceTree = "<group>"; };
+		E37A2F1A2B8523300087F394 /* NetworkingProcessExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = NetworkingProcessExtension.entitlements; sourceTree = "<group>"; };
+		E37A2F1B2B8523B10087F394 /* WebContentProcessExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = WebContentProcessExtension.entitlements; sourceTree = "<group>"; };
+		E37A2F1C2B8523B10087F394 /* GPUProcessExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = GPUProcessExtension.entitlements; sourceTree = "<group>"; };
 		E3816B3B27E24639005EAFC0 /* WebMockContentFilterManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebMockContentFilterManager.cpp; path = Network/WebMockContentFilterManager.cpp; sourceTree = "<group>"; };
 		E3816B3C27E24639005EAFC0 /* WebMockContentFilterManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebMockContentFilterManager.h; path = Network/WebMockContentFilterManager.h; sourceTree = "<group>"; };
 		E3866AE42397400400F88FE9 /* WebDeviceOrientationUpdateProviderProxy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebDeviceOrientationUpdateProviderProxy.mm; path = ios/WebDeviceOrientationUpdateProviderProxy.mm; sourceTree = "<group>"; };
@@ -12139,11 +12142,14 @@
 				5C139DB829DB847E00D5117B /* AuxiliaryProcessExtensionBridge.mm */,
 				5C139DB529DB847D00D5117B /* com.apple.WebKit.appexpt */,
 				5C139DB629DB847E00D5117B /* GPUExtension-Info.plist */,
+				E37A2F1C2B8523B10087F394 /* GPUProcessExtension.entitlements */,
 				E3B9B5D62AB65822008568FE /* GPUProcessExtension.swift */,
 				5C139DB729DB847E00D5117B /* NetworkingExtension-Info.plist */,
+				E37A2F1A2B8523300087F394 /* NetworkingProcessExtension.entitlements */,
 				E3B9B5D42AB65795008568FE /* NetworkingProcessExtension.swift */,
 				5C139DB029DB847C00D5117B /* WebContentExtension-CaptivePortal-Info.plist */,
 				5C139DB129DB847D00D5117B /* WebContentExtension-Info.plist */,
+				E37A2F1B2B8523B10087F394 /* WebContentProcessExtension.entitlements */,
 				5C139DB929DB847E00D5117B /* WebContentProcessExtension.swift */,
 			);
 			path = AuxiliaryProcessExtensions;