<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167543] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167543">167543</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-04-19 13:10:49 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsNetworkServiceDevelopmentxcconfig">trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsNetworkServicexcconfig">trunk/Source/WebKit2/Configurations/NetworkService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentServiceDevelopmentxcconfig">trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentServicexcconfig">trunk/Source/WebKit2/Configurations/WebContentService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2Prefixh">trunk/Source/WebKit2/WebKit2Prefix.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167542 => 167543)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-04-19 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ 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 <mitz@apple.com>
+
</ins><span class="cx"> [Cocoa] Crash in -[WKWebProcessPlugInHitTestResult nodeHandle] when nodeHandle() is null
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131888
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsNetworkServiceDevelopmentxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig (167542 => 167543)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
</span><span class="cx"> INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist;
</span><span class="cx"> INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist;
</span><ins>+INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
</ins><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsNetworkServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/NetworkService.xcconfig (167542 => 167543)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
</span><span class="cx"> INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
</span><span class="cx"> INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
</span><ins>+INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
</ins><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentServiceDevelopmentxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (167542 => 167543)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
</span><span class="cx"> INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist;
</span><span class="cx"> INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist;
</span><ins>+INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
</ins><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (167542 => 167543)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Normal;
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.WebContent;
</span><del>-
</del><span class="cx"> INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
</span><span class="cx"> INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
</span><span class="cx"> INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
</span><ins>+INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
</ins><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (167542 => 167543)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -501,12 +501,26 @@
</span><span class="cx"> RunLoop::main().dispatch(bind(didFinishLaunchingProcessFunction, that, processIdentifier, IPC::Connection::Identifier(listeningPort)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void ProcessLauncher::launchProcess()
</span><span class="cx"> {
</span><span class="cx"> if (tryPreexistingProcess(m_launchOptions, this, &ProcessLauncher::didFinishLaunchingProcess))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:@"/System/"];
</del><ins>+ bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];
</ins><span class="cx">
</span><span class="cx"> if (m_launchOptions.useXPC) {
</span><span class="cx"> createService(m_launchOptions, isWebKitDevelopmentBuild, this, &ProcessLauncher::didFinishLaunchingProcess);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2Prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2Prefix.h (167542 => 167543)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> #define ENABLE_SHARED_WORKER_PROCESS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090) || !PLATFORM(IOS_SIMULATOR)
</del><ins>+#if !(defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1080)
</ins><span class="cx"> #define WTF_USE_XPC_SERVICES 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>