Attachment 339246 Details for Bug 185175 – Patch

[patch] Patch

bug-185175-20180501171910.patch (text/plain), 4.20 KB, created by Jer Noble on 2018-05-01 17:19:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-05-01 17:19:10 PDT

Size: 4.20 KB

patch

obsolete

>Subversion Revision: 231157
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index e5d9c8585c820d38bb3490301086de9f7d3bb0bf..055f2494a34f59760cc306f704b71c4a121d4284 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-01  Jer Noble  <jer.noble@apple.com>
>+
>+        Get the WebKit.framework bundle by asking for WKWebView
>+        https://bugs.webkit.org/show_bug.cgi?id=185175
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/mac/NetworkProcessMac.mm:
>+        (WebKit::NetworkProcess::initializeSandbox):
>+        * Shared/mac/ChildProcessMac.mm:
>+        (WebKit::ChildProcess::initializeSandbox):
>+        * StorageProcess/mac/StorageProcessMac.mm:
>+        (WebKit::StorageProcess::initializeSandbox):
>+
> 2018-05-01  Jer Noble  <jer.noble@apple.com>
> 
>         Production build error in Migrate Header phase when WK_ALTERNATE_FRAMEWORKS_DIR is set to non-empty value
>diff --git a/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm b/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
>index 54ab302f7eff777efc5ee93a8dc52e5c44784adf..3ca7d29bc07738d22293aa8d27e03eed0422e93f 100644
>--- a/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
>+++ b/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
>@@ -119,7 +119,12 @@ void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo&
> void NetworkProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
> {
>     // Need to overide the default, because service has a different bundle ID.
>-    NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
>+#if WK_API_ENABLED
>+    NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
>+#else
>+    NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
>+#endif
>+
>     sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.NetworkProcess" ofType:@"sb"]);
> 
>     ChildProcess::initializeSandbox(parameters, sandboxParameters);
>diff --git a/Source/WebKit/Shared/mac/ChildProcessMac.mm b/Source/WebKit/Shared/mac/ChildProcessMac.mm
>index 0013c1079cf021ffe74f1f6a79e61efc6f35427c..da67b1c1213e0caa5fb3313841abf45eb373e367 100644
>--- a/Source/WebKit/Shared/mac/ChildProcessMac.mm
>+++ b/Source/WebKit/Shared/mac/ChildProcessMac.mm
>@@ -111,7 +111,11 @@ static OSStatus enableSandboxStyleFileQuarantine()
> 
> void ChildProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
> {
>-    NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
>+#if WK_API_ENABLED
>+    NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
>+#else
>+    NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
>+#endif
>     String defaultProfilePath = [webkit2Bundle pathForResource:[[NSBundle mainBundle] bundleIdentifier] ofType:@"sb"];
> 
>     if (sandboxParameters.userDirectorySuffix().isNull()) {
>diff --git a/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm b/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
>index b4132935ace67b19d021909745773102cb9582a2..a1e0001b275506c7bc2a28f33bb893bc4f4d14bd 100644
>--- a/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
>+++ b/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
>@@ -53,7 +53,11 @@ void StorageProcess::initializeProcessName(const ChildProcessInitializationParam
> void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
> {
>     // Need to overide the default, because service has a different bundle ID.
>-    NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
>+#if WK_API_ENABLED
>+    NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
>+#else
>+    NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
>+#endif
>     sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.Storage" ofType:@"sb"]);
> 
>     ChildProcess::initializeSandbox(parameters, sandboxParameters);

Actions: View | Formatted Diff | Diff

Attachments on bug 185175: 339243 | 339246 | 339249 | 339270 | 339274 | 339302