Title: [231239] trunk/Source/WebKit
- Revision
- 231239
- Author
- [email protected]
- Date
- 2018-05-02 10:14:10 -0700 (Wed, 02 May 2018)
Log Message
Get the WebKit.framework bundle by asking for WKWebView
https://bugs.webkit.org/show_bug.cgi?id=185175
Reviewed by Tim Horton.
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::initializeSandbox):
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::initializeSandbox):
* StorageProcess/mac/StorageProcessMac.mm:
(WebKit::StorageProcess::initializeSandbox):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (231238 => 231239)
--- trunk/Source/WebKit/ChangeLog 2018-05-02 17:05:50 UTC (rev 231238)
+++ trunk/Source/WebKit/ChangeLog 2018-05-02 17:14:10 UTC (rev 231239)
@@ -1,3 +1,17 @@
+2018-05-02 Jer Noble <[email protected]>
+
+ Get the WebKit.framework bundle by asking for WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=185175
+
+ Reviewed by Tim Horton.
+
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::NetworkProcess::initializeSandbox):
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::initializeSandbox):
+ * StorageProcess/mac/StorageProcessMac.mm:
+ (WebKit::StorageProcess::initializeSandbox):
+
2018-05-02 Youenn Fablet <[email protected]>
Cannot gather srflx or relay ICE candidates on IPv6 network (ICE agent hangs?)
Modified: trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm (231238 => 231239)
--- trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2018-05-02 17:05:50 UTC (rev 231238)
+++ trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2018-05-02 17:14:10 UTC (rev 231239)
@@ -36,6 +36,7 @@
#import "SandboxInitializationParameters.h"
#import "SecItemShim.h"
#import "StringUtilities.h"
+#import "WKFoundation.h"
#import <WebCore/CertificateInfo.h>
#import <WebCore/FileSystem.h>
#import <WebCore/LocalizedStrings.h>
@@ -119,9 +120,14 @@
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")];
- sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.NetworkProcess" ofType:@"sb"]);
+#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);
}
Modified: trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm (231238 => 231239)
--- trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2018-05-02 17:05:50 UTC (rev 231238)
+++ trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2018-05-02 17:14:10 UTC (rev 231239)
@@ -31,6 +31,7 @@
#import "CodeSigning.h"
#import "QuarantineSPI.h"
#import "SandboxInitializationParameters.h"
+#import "WKFoundation.h"
#import "XPCServiceEntryPoint.h"
#import <WebCore/FileSystem.h>
#import <WebCore/SystemVersion.h>
@@ -111,8 +112,12 @@
void ChildProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
{
- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
- String defaultProfilePath = [webkit2Bundle pathForResource:[[NSBundle mainBundle] bundleIdentifier] ofType:@"sb"];
+#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()) {
auto userDirectorySuffix = parameters.extraInitializationData.find("user-directory-suffix");
@@ -146,7 +151,7 @@
}
setenv("TMPDIR", temporaryDirectory, 1);
- sandboxParameters.addPathParameter("WEBKIT2_FRAMEWORK_DIR", [[webkit2Bundle bundlePath] stringByDeletingLastPathComponent]);
+ sandboxParameters.addPathParameter("WEBKIT2_FRAMEWORK_DIR", [[webKit2Bundle bundlePath] stringByDeletingLastPathComponent]);
sandboxParameters.addConfDirectoryParameter("DARWIN_USER_TEMP_DIR", _CS_DARWIN_USER_TEMP_DIR);
sandboxParameters.addConfDirectoryParameter("DARWIN_USER_CACHE_DIR", _CS_DARWIN_USER_CACHE_DIR);
Modified: trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm (231238 => 231239)
--- trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm 2018-05-02 17:05:50 UTC (rev 231238)
+++ trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm 2018-05-02 17:14:10 UTC (rev 231239)
@@ -30,6 +30,7 @@
#import "StorageProcess.h"
#import "SandboxInitializationParameters.h"
+#import "WKFoundation.h"
#import <WebCore/FileSystem.h>
#import <WebCore/LocalizedStrings.h>
#import <pal/spi/cocoa/LaunchServicesSPI.h>
@@ -53,8 +54,12 @@
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")];
- sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.Storage" ofType:@"sb"]);
+#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);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
