Title: [167543] trunk/Source/WebKit2
- Revision
- 167543
- Author
- [email protected]
- Date
- 2014-04-19 13:10:49 -0700 (Sat, 19 Apr 2014)
Log Message
Use XPC services in the iOS Simulator, but not in Mountain Lion
https://bugs.webkit.org/show_bug.cgi?id=131894
Reviewed by Anders Carlsson.
* Configurations/NetworkService.Development.xcconfig: Defined INFOPLIST_FILE for the
Simulator.
* Configurations/NetworkService.xcconfig: Ditto.
* Configurations/WebContentService.Development.xcconfig: Ditto.
* Configurations/WebContentService.xcconfig: Ditto.
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::systemDirectoryPath): Added this helper function that returns a slash-terminated
path to the System directory in the current runtime.
(WebKit::ProcessLauncher::launchProcess): Changed to use the above function to tell whether
a development version of WebKit2 is being used.
* WebKit2Prefix.h: Set WTF_USE_XPC_SERVICES to 1 when targeting the iOS Simulator, but not
when targeting Mountain Lion.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167542 => 167543)
--- trunk/Source/WebKit2/ChangeLog 2014-04-19 19:47:27 UTC (rev 167542)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-19 20:10:49 UTC (rev 167543)
@@ -1,5 +1,25 @@
2014-04-19 Dan Bernstein <[email protected]>
+ Use XPC services in the iOS Simulator, but not in Mountain Lion
+ https://bugs.webkit.org/show_bug.cgi?id=131894
+
+ Reviewed by Anders Carlsson.
+
+ * Configurations/NetworkService.Development.xcconfig: Defined INFOPLIST_FILE for the
+ Simulator.
+ * Configurations/NetworkService.xcconfig: Ditto.
+ * Configurations/WebContentService.Development.xcconfig: Ditto.
+ * Configurations/WebContentService.xcconfig: Ditto.
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::systemDirectoryPath): Added this helper function that returns a slash-terminated
+ path to the System directory in the current runtime.
+ (WebKit::ProcessLauncher::launchProcess): Changed to use the above function to tell whether
+ a development version of WebKit2 is being used.
+ * WebKit2Prefix.h: Set WTF_USE_XPC_SERVICES to 1 when targeting the iOS Simulator, but not
+ when targeting Mountain Lion.
+
+2014-04-19 Dan Bernstein <[email protected]>
+
[Cocoa] Crash in -[WKWebProcessPlugInHitTestResult nodeHandle] when nodeHandle() is null
https://bugs.webkit.org/show_bug.cgi?id=131888
Modified: trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig (167542 => 167543)
--- trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-04-19 19:47:27 UTC (rev 167542)
+++ trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-04-19 20:10:49 UTC (rev 167543)
@@ -29,6 +29,7 @@
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist;
INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist;
+INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
Modified: trunk/Source/WebKit2/Configurations/NetworkService.xcconfig (167542 => 167543)
--- trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-04-19 19:47:27 UTC (rev 167542)
+++ trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-04-19 20:10:49 UTC (rev 167543)
@@ -29,6 +29,7 @@
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
+INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
Modified: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (167542 => 167543)
--- trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-04-19 19:47:27 UTC (rev 167542)
+++ trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-04-19 20:10:49 UTC (rev 167543)
@@ -29,6 +29,7 @@
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist;
INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist;
+INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements
Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (167542 => 167543)
--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2014-04-19 19:47:27 UTC (rev 167542)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2014-04-19 20:10:49 UTC (rev 167543)
@@ -26,10 +26,10 @@
WK_XPC_SERVICE_VARIANT = Normal;
PRODUCT_NAME = com.apple.WebKit.WebContent;
-
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
+INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (167542 => 167543)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-04-19 19:47:27 UTC (rev 167542)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-04-19 20:10:49 UTC (rev 167543)
@@ -501,12 +501,26 @@
RunLoop::main().dispatch(bind(didFinishLaunchingProcessFunction, that, processIdentifier, IPC::Connection::Identifier(listeningPort)));
}
+static NSString *systemDirectoryPath()
+{
+ static NSString *path = [^{
+#if PLATFORM(IOS_SIMULATOR)
+ char *simulatorRoot = getenv("SIMULATOR_ROOT");
+ return simulatorRoot ? [NSString stringWithFormat:@"%s/System/", simulatorRoot] : @"/System/";
+#else
+ return @"/System/";
+#endif
+ }() copy];
+
+ return path;
+}
+
void ProcessLauncher::launchProcess()
{
if (tryPreexistingProcess(m_launchOptions, this, &ProcessLauncher::didFinishLaunchingProcess))
return;
- bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:@"/System/"];
+ bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];
if (m_launchOptions.useXPC) {
createService(m_launchOptions, isWebKitDevelopmentBuild, this, &ProcessLauncher::didFinishLaunchingProcess);
Modified: trunk/Source/WebKit2/WebKit2Prefix.h (167542 => 167543)
--- trunk/Source/WebKit2/WebKit2Prefix.h 2014-04-19 19:47:27 UTC (rev 167542)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2014-04-19 20:10:49 UTC (rev 167543)
@@ -64,7 +64,7 @@
#define ENABLE_SHARED_WORKER_PROCESS 1
#endif
-#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090) || !PLATFORM(IOS_SIMULATOR)
+#if !(defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1080)
#define WTF_USE_XPC_SERVICES 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
