Attachment 341682 Details for Bug 184485 – Patch

[patch] Patch

bug-184485-20180531120442.patch (text/plain), 5.67 KB, created by Brent Fulgham on 2018-05-31 12:04:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-05-31 12:04:43 PDT

Size: 5.67 KB

patch

obsolete

>Subversion Revision: 232356
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index dc9918f689712104bfb212a1b0ee7fa115558a79..a1e113e36187f56f2aa60464cd9db6f9c82a6b6e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-05-31  Brent Fulgham  <bfulgham@apple.com>
>+
>+        [macOS] Add JIT entitlements to WebContent process and plugin process on macOS
>+        https://bugs.webkit.org/show_bug.cgi?id=184485
>+        <rdar://problem/37556535>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch builds on the changes from Bug 185526 to add support for a JIT entitlement. It makes the
>+        following changes:
>+
>+        1. Adds a new 'WebContent-OSX.entitlements file that unconditionally adds the JIT entitlement for all builds.
>+        2. Modifies the PluginService.entitlements to unconditionally add the JIT entitlement.
>+
>+        * Configurations/PluginService.entitlements: Updated to add the JIT entitlement.
>+        * Configurations/WebContent-OSX.entitlements: Updated to add the JIT entitlement.
>+        * Configurations/WebContentService.xcconfig: Updated to use the new 'WebContent-OSX.entitlements' file.
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2018-05-31  Antti Koivisto  <antti@apple.com>
> 
>         WebKit memory management: Safari jetsams on some websites when zooming and scrolling
>diff --git a/Source/WebKit/Configurations/PluginService.entitlements b/Source/WebKit/Configurations/PluginService.entitlements
>index dba7af5c1ffa25cc0384354a9b4df39e0cc43402..25e58ca5e26a0354714f719efa86ac676534a39d 100644
>--- a/Source/WebKit/Configurations/PluginService.entitlements
>+++ b/Source/WebKit/Configurations/PluginService.entitlements
>@@ -2,6 +2,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.security.cs.allow-jit</key>
>+	<true/>
> 	<key>com.apple.security.print</key>
> 	<true/>
> 	<key>com.apple.security.files.user-selected.read-write</key>
>diff --git a/Source/WebKit/Configurations/WebContent-OSX.entitlements b/Source/WebKit/Configurations/WebContent-OSX.entitlements
>new file mode 100644
>index 0000000000000000000000000000000000000000..d35e43ae588cdfe5570930260829dcd145c4d1e2
>--- /dev/null
>+++ b/Source/WebKit/Configurations/WebContent-OSX.entitlements
>@@ -0,0 +1,8 @@
>+<?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.security.cs.allow-jit</key>
>+	<true/>
>+</dict>
>+</plist>
>diff --git a/Source/WebKit/Configurations/WebContentService.xcconfig b/Source/WebKit/Configurations/WebContentService.xcconfig
>index 1602f21d0cba3b16fa1fb5910ee3069ec4d4a8d1..c5af8c7e66522bc2725d639c8b05af977024bca3 100644
>--- a/Source/WebKit/Configurations/WebContentService.xcconfig
>+++ b/Source/WebKit/Configurations/WebContentService.xcconfig
>@@ -32,7 +32,7 @@ WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvos = WebContent-iOS;
> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvsimulator = WebContent-iOS;
> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iphoneminimalsimulator = WebContent-iOS-minimalsimulator;
> 
>-CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_NO = $(CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT));
>+CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_NO = Configurations/WebContent-OSX.entitlements;
> OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
> 
> PRODUCT_NAME = $(PRODUCT_NAME_$(WK_XPC_SERVICE_VARIANT));
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index b519ff6691881670cc43c8ee91657121a831d739..50be83fcb5b4ebfb3191a715e4c96254853a7857 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -3796,6 +3796,7 @@
> 		7AF2361E1E79A3B400438A05 /* WebErrors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebErrors.cpp; sourceTree = "<group>"; };
> 		7AF2361F1E79A3D800438A05 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
> 		7AF236221E79A43100438A05 /* WebErrorsCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebErrorsCocoa.mm; sourceTree = "<group>"; };
>+		7AF66E1120C07CB6007828EA /* WebContent-OSX.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "WebContent-OSX.entitlements"; sourceTree = "<group>"; };
> 		7C065F291C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebUserContentControllerDataTypes.cpp; sourceTree = "<group>"; };
> 		7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserContentControllerDataTypes.h; sourceTree = "<group>"; };
> 		7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WebContent-iOS.entitlements"; sourceTree = "<group>"; };
>@@ -5061,6 +5062,7 @@
> 				1A4F976E100E7B6600637A18 /* Version.xcconfig */,
> 				7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
> 				37B418EB1C9624F20031E63B /* WebContent-OSX-restricted.entitlements */,
>+				7AF66E1120C07CB6007828EA /* WebContent-OSX.entitlements */,
> 				372EBB4A2017E76000085064 /* WebContentService.Development.xcconfig */,
> 				BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
> 				BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */,

Actions: View | Formatted Diff | Diff

Attachments on bug 184485: 337676 | 341668 | 341676 | 341682