<!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>[194022] 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/194022">194022</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-12-13 19:19:47 -0800 (Sun, 13 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Shims used by XPC services are installed inside legacy process bundles
https://bugs.webkit.org/show_bug.cgi?id=152233
Reviewed by Sam Weinig.
Have the shim dylibs installed in the framework’s Frameworks directory instead.
* Configurations/BaseLegacyProcess.xcconfig: Simplified now that EXCLUDED_SHIM_FILE_NAME is
no longer defined, because shims aren’t copied into legacy processes.
* Configurations/NetworkProcess.xcconfig: Removed definition of EXCLUDED_SHIM_FILE_NAME.
* Configurations/PluginProcess.xcconfig: Ditto.
* Configurations/WebContentProcess.xcconfig: Ditto.
* Configurations/Shim.xcconfig: Install the shims when building for OS X. Added definitions
of INSTALL_PATH and DYLIB_INSTALL_NAME_BASE which are now common to all shims.
* Configurations/PluginProcessShim.xcconfig: Removed definitions of INSTALL_PATH and
DYLIB_INSTALL_NAME_BASE from here, now that they are defined for all shims in
Shim.xcconfig.
* Configurations/SecItemShim.xcconfig: Ditto.
* Configurations/WebProcessShim.xcconfig:
* Configurations/WebKit.xcconfig: Added the shims to EXCLUDED_SOURCE_FILE_NAMES for iOS.
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Changed
the value of DYLD_INSERT_LIBRARIES to point to the shim’s new location.
* PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Ditto.
* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Ditto.
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::computeProcessShimPath): Changed to return the new paths, which are all inside the
framework’s Frameworks directory.
* WebKit2.xcodeproj/project.pbxproj:
- Removed references to WRAPPER_NAME from the “Copy XPC services for engineering builds”
build phase in the All target, becase WRAPPER_NAME is empty in an aggregate target.
- Removed the PlugInProcess target’s dependency on the PluginProcessShim target and its
Copy Plug-in Process Shim build phase.
- Removed the NetworkProcess target’s dependency on the SecItemShim target and its Copy
Sec Item Shim build phase.
- Removed the WebProcess target’s dependency on the WebProcessShim target and its Copy
WebProcessShim build phase.
- Made the WebKit target depend on the shim targets, and added to it a Copy Shims build
phase that copies the shims into the framework’s Frameworks directory.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseLegacyProcessxcconfig">trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsNetworkProcessxcconfig">trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginProcessxcconfig">trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginProcessShimxcconfig">trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsSecItemShimxcconfig">trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsShimxcconfig">trunk/Source/WebKit2/Configurations/Shim.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentProcessxcconfig">trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKitxcconfig">trunk/Source/WebKit2/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebProcessShimxcconfig">trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoOSX1091010plist">trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessEntryPointmacXPCServicePluginService32641091010Infoplist">trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSX1091010plist">trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2015-12-13 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Mac] Shims used by XPC services are installed inside legacy process bundles
+ https://bugs.webkit.org/show_bug.cgi?id=152233
+
+ Reviewed by Sam Weinig.
+
+ Have the shim dylibs installed in the framework’s Frameworks directory instead.
+
+ * Configurations/BaseLegacyProcess.xcconfig: Simplified now that EXCLUDED_SHIM_FILE_NAME is
+ no longer defined, because shims aren’t copied into legacy processes.
+
+ * Configurations/NetworkProcess.xcconfig: Removed definition of EXCLUDED_SHIM_FILE_NAME.
+ * Configurations/PluginProcess.xcconfig: Ditto.
+ * Configurations/WebContentProcess.xcconfig: Ditto.
+
+ * Configurations/Shim.xcconfig: Install the shims when building for OS X. Added definitions
+ of INSTALL_PATH and DYLIB_INSTALL_NAME_BASE which are now common to all shims.
+
+ * Configurations/PluginProcessShim.xcconfig: Removed definitions of INSTALL_PATH and
+ DYLIB_INSTALL_NAME_BASE from here, now that they are defined for all shims in
+ Shim.xcconfig.
+ * Configurations/SecItemShim.xcconfig: Ditto.
+ * Configurations/WebProcessShim.xcconfig:
+
+ * Configurations/WebKit.xcconfig: Added the shims to EXCLUDED_SOURCE_FILE_NAMES for iOS.
+
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Changed
+ the value of DYLD_INSERT_LIBRARIES to point to the shim’s new location.
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Ditto.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Ditto.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::computeProcessShimPath): Changed to return the new paths, which are all inside the
+ framework’s Frameworks directory.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ - Removed references to WRAPPER_NAME from the “Copy XPC services for engineering builds”
+ build phase in the All target, becase WRAPPER_NAME is empty in an aggregate target.
+ - Removed the PlugInProcess target’s dependency on the PluginProcessShim target and its
+ Copy Plug-in Process Shim build phase.
+ - Removed the NetworkProcess target’s dependency on the SecItemShim target and its Copy
+ Sec Item Shim build phase.
+ - Removed the WebProcess target’s dependency on the WebProcessShim target and its Copy
+ WebProcessShim build phase.
+ - Made the WebKit target depend on the shim targets, and added to it a Copy Shims build
+ phase that copies the shims into the framework’s Frameworks directory.
+
+2015-12-13 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Build fix.
</span><span class="cx">
</span><span class="cx"> * Configurations/PluginProcess.xcconfig:
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseLegacyProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -31,9 +31,7 @@
</span><span class="cx"> APP_ICON_Production = ;
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_Production = $(EXCLUDED_SHIM_FILE_NAME) WebKit.icns;
-EXCLUDED_SOURCE_FILE_NAMES_Debug = $(EXCLUDED_SHIM_FILE_NAME);
-EXCLUDED_SOURCE_FILE_NAMES_Release = $(EXCLUDED_SHIM_FILE_NAME);
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
</ins><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsNetworkProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -26,6 +26,4 @@
</span><span class="cx"> PRODUCT_NAME = NetworkProcess;
</span><span class="cx"> INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist;
</span><span class="cx">
</span><del>-EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = SecItemShim.dylib;
-
</del><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/Network-iOS.entitlements;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -32,6 +32,4 @@
</span><span class="cx"> LDFLAGS_SHIM_Production[sdk=macosx*] = $(LDFLAGS_SHIM_$(WK_LINK_SHIM));
</span><span class="cx"> LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
</span><span class="cx">
</span><del>-EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;
-
</del><span class="cx"> SKIP_INSTALL[sdk=iphone*] = YES;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginProcessShimxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -25,8 +25,5 @@
</span><span class="cx">
</span><span class="cx"> #include "Shim.xcconfig"
</span><span class="cx">
</span><del>-INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
-
</del><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit -framework Carbon -framework QuartzCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsSecItemShimxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -25,8 +25,5 @@
</span><span class="cx">
</span><span class="cx"> #include "Shim.xcconfig"
</span><span class="cx">
</span><del>-INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
-DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
-
</del><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Security;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsShimxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Shim.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/Shim.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/Shim.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -25,4 +25,7 @@
</span><span class="cx">
</span><span class="cx"> GCC_DYNAMIC_NO_PIC = NO;
</span><span class="cx"> SKIP_INSTALL = YES;
</span><ins>+SKIP_INSTALL[sdk=macosx*] = NO;
</ins><span class="cx">
</span><ins>+INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -26,6 +26,4 @@
</span><span class="cx"> PRODUCT_NAME = WebProcess;
</span><span class="cx"> INFOPLIST_FILE = WebProcess/EntryPoint/mac/LegacyProcess/Info.plist;
</span><span class="cx">
</span><del>-EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = WebProcessShim.dylib;
-
</del><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/WebContent-iOS.entitlements;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
</span><span class="cx"> SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PlugInProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
</ins><span class="cx">
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebProcessShimxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -25,8 +25,5 @@
</span><span class="cx">
</span><span class="cx"> #include "Shim.xcconfig"
</span><span class="cx">
</span><del>-INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
-
</del><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework CoreServices -framework Security;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoOSX1091010plist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> <key>EnvironmentVariables</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>DYLD_INSERT_LIBRARIES</key>
</span><del>- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
</del><ins>+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/SecItemShim.dylib</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessEntryPointmacXPCServicePluginService32641091010Infoplist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> <key>EnvironmentVariables</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>DYLD_INSERT_LIBRARIES</key>
</span><del>- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
</del><ins>+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/PluginProcessShim.dylib</string>
</ins><span class="cx"> <key>NSStringDisableTagged</key>
</span><span class="cx"> <string>YES</string>
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -97,28 +97,16 @@
</span><span class="cx"> static RetainPtr<NSString> computeProcessShimPath(const ProcessLauncher::LaunchOptions& launchOptions, NSBundle *webKitBundle)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- if (launchOptions.processType == ProcessLauncher::PluginProcess) {
- NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
- NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
-
- return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
- }
</del><ins>+ if (launchOptions.processType == ProcessLauncher::PluginProcess)
+ return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (launchOptions.processType == ProcessLauncher::NetworkProcess) {
- NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
- NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
</del><ins>+ if (launchOptions.processType == ProcessLauncher::NetworkProcess)
+ return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"SecItemShim.dylib"];
</ins><span class="cx">
</span><del>- return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"SecItemShim.dylib"];
- }
</del><ins>+ if (launchOptions.processType == ProcessLauncher::WebProcess)
+ return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"WebProcessShim.dylib"];
</ins><span class="cx">
</span><del>- if (launchOptions.processType == ProcessLauncher::WebProcess) {
- NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
- NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
-
- return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"WebProcessShim.dylib"];
- }
-
</del><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -828,6 +828,9 @@
</span><span class="cx"> 37A5E01418BBF93F000A081E /* _WKActivatedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 37A64E5518F38E3C00EB30F1 /* _WKInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5418F38E3C00EB30F1 /* _WKInputDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 37A64E5718F38F4600EB30F1 /* _WKFormInputSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 37B0D1841C1E499A00D40D64 /* PluginProcessShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; };
+ 37B0D1851C1E499A00D40D64 /* SecItemShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */; };
+ 37B0D1861C1E499A00D40D64 /* WebProcessShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */; };
</ins><span class="cx"> 37B5045219EEF31300CE2CF8 /* WKErrorPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
</span><span class="cx"> 37BEC4E019491486008B4286 /* CompletionHandlerCallChecker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */; };
</span><span class="lines">@@ -1618,7 +1621,6 @@
</span><span class="cx"> BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
</span><span class="cx"> BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; };
</span><span class="cx"> BCDE059C11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCDE059A11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp */; };
</span><del>- BCDE093D13272496001259FB /* PluginProcessShim.dylib in Copy Plug-in Process Shim */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; };
</del><span class="cx"> BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = BCDE094213272496001259FB /* PluginProcess.app */; };
</span><span class="cx"> BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE0937514FB128B001138D9 /* LayerHostingContext.mm */; };
</span><span class="cx"> BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0937614FB128B001138D9 /* LayerHostingContext.h */; };
</span><span class="lines">@@ -1727,7 +1729,6 @@
</span><span class="cx"> CDA041F41ACE2105004A13EC /* BackBoardServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */; };
</span><span class="cx"> CDC382FE17211799008A2FC3 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
</span><span class="cx"> CDC38307172117DD008A2FC3 /* CookieStorageShimLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */; };
</span><del>- CDC3830817211890008A2FC3 /* WebProcessShim.dylib in Copy WebProcessShim */ = {isa = PBXBuildFile; fileRef = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */; };
</del><span class="cx"> CDC3830C17212282008A2FC3 /* CookieStorageShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */; };
</span><span class="cx"> CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC3830D1721242D008A2FC3 /* CookieStorageShim.mm */; };
</span><span class="cx"> CDCA85C8132ABA4E00E961DF /* WKFullScreenWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */; };
</span><span class="lines">@@ -1765,7 +1766,6 @@
</span><span class="cx"> E179088F169BAA6A006904C7 /* SecItemShim.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6948169B77C8009B6670 /* SecItemShim.h */; };
</span><span class="cx"> E1790890169BAA7F006904C7 /* SecItemShimMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E6911169B667B009B6670 /* SecItemShimMessageReceiver.cpp */; };
</span><span class="cx"> E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6912169B667B009B6670 /* SecItemShimMessages.h */; };
</span><del>- E1790901169BB4F9006904C7 /* SecItemShim.dylib in Copy Sec Item Shim */ = {isa = PBXBuildFile; fileRef = 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */; };
</del><span class="cx"> E1798C7916E6818800240139 /* NetworkBlobRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1798C7716E6818800240139 /* NetworkBlobRegistry.cpp */; };
</span><span class="cx"> E1798C7A16E6818800240139 /* NetworkBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1798C7816E6818800240139 /* NetworkBlobRegistry.h */; };
</span><span class="cx"> E179FD9C134D38060015B883 /* ArgumentCodersMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E179FD9B134D38060015B883 /* ArgumentCodersMac.h */; };
</span><span class="lines">@@ -1924,6 +1924,27 @@
</span><span class="cx"> remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
</span><span class="cx"> remoteInfo = WebKit;
</span><span class="cx"> };
</span><ins>+ 37B1D0131C1E421100D67FE9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 1AC25FAF12A48EA700BD2671;
+ remoteInfo = PluginProcessShim;
+ };
+ 37B1D0151C1E421100D67FE9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 510031EA1379CACB00C8DFE4;
+ remoteInfo = SecItemShim;
+ };
+ 37B1D0171C1E421100D67FE9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = CDC382FB17211799008A2FC3;
+ remoteInfo = WebProcessShim;
+ };
</ins><span class="cx"> 37F7407812721F740093869B /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -2022,13 +2043,6 @@
</span><span class="cx"> remoteGlobalIDString = BCAE9DE8160C097400A33217;
</span><span class="cx"> remoteInfo = WebProcessServiceForWebKitDevelopment;
</span><span class="cx"> };
</span><del>- BCDE093513272496001259FB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 1AC25FAF12A48EA700BD2671;
- remoteInfo = PluginProcessShim;
- };
</del><span class="cx"> BCDE093713272496001259FB /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -2043,20 +2057,6 @@
</span><span class="cx"> remoteGlobalIDString = BCDE093313272496001259FB;
</span><span class="cx"> remoteInfo = "Plugin Process";
</span><span class="cx"> };
</span><del>- CDC3830917211ABE008A2FC3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = CDC382FB17211799008A2FC3;
- remoteInfo = WebProcessShim;
- };
- CDC8F4D41725F73F00166F6E /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 510031EA1379CACB00C8DFE4;
- remoteInfo = SecItemShim;
- };
</del><span class="cx"> E1B1B18E1A7AC1F5007B0965 /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -2102,15 +2102,17 @@
</span><span class="cx"> name = "Copy Files";
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- 5183B38F1379F56800E8754E /* Copy WebProcessShim */ = {
</del><ins>+ 372589431C1E496800C92CA9 /* Copy Shims */ = {
</ins><span class="cx"> isa = PBXCopyFilesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><del>- dstPath = WebProcess.app/Contents/MacOS;
- dstSubfolderSpec = 16;
</del><ins>+ dstPath = "";
+ dstSubfolderSpec = 10;
</ins><span class="cx"> files = (
</span><del>- CDC3830817211890008A2FC3 /* WebProcessShim.dylib in Copy WebProcessShim */,
</del><ins>+ 37B0D1841C1E499A00D40D64 /* PluginProcessShim.dylib in Copy Shims */,
+ 37B0D1851C1E499A00D40D64 /* SecItemShim.dylib in Copy Shims */,
+ 37B0D1861C1E499A00D40D64 /* WebProcessShim.dylib in Copy Shims */,
</ins><span class="cx"> );
</span><del>- name = "Copy WebProcessShim";
</del><ins>+ name = "Copy Shims";
</ins><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="cx"> 7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */ = {
</span><span class="lines">@@ -2142,28 +2144,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- BCDE093C13272496001259FB /* Copy Plug-in Process Shim */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = PluginProcess.app/Contents/MacOS;
- dstSubfolderSpec = 16;
- files = (
- BCDE093D13272496001259FB /* PluginProcessShim.dylib in Copy Plug-in Process Shim */,
- );
- name = "Copy Plug-in Process Shim";
- runOnlyForDeploymentPostprocessing = 0;
- };
- E1790900169BB4D3006904C7 /* Copy Sec Item Shim */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = NetworkProcess.app/Contents/MacOS;
- dstSubfolderSpec = 16;
- files = (
- E1790901169BB4F9006904C7 /* SecItemShim.dylib in Copy Sec Item Shim */,
- );
- name = "Copy Sec Item Shim";
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> /* End PBXCopyFilesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFileReference section */
</span><span class="lines">@@ -8533,13 +8513,11 @@
</span><span class="cx"> buildPhases = (
</span><span class="cx"> 1A50DB1A110A3BDC000D3FE5 /* Resources */,
</span><span class="cx"> 1A50DB1B110A3BDC000D3FE5 /* Sources */,
</span><del>- 5183B38F1379F56800E8754E /* Copy WebProcessShim */,
</del><span class="cx"> BC5D24B016CC3F28007D5461 /* Frameworks */,
</span><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><del>- CDC3830A17211ABE008A2FC3 /* PBXTargetDependency */,
</del><span class="cx"> 1A50DB27110A3BEF000D3FE5 /* PBXTargetDependency */,
</span><span class="cx"> );
</span><span class="cx"> name = WebProcess;
</span><span class="lines">@@ -8587,13 +8565,11 @@
</span><span class="cx"> buildPhases = (
</span><span class="cx"> 510CC80A1613C79900D03ED3 /* Sources */,
</span><span class="cx"> 510CC80C1613C79900D03ED3 /* Resources */,
</span><del>- E1790900169BB4D3006904C7 /* Copy Sec Item Shim */,
</del><span class="cx"> BC5D24B416CC3F43007D5461 /* Frameworks */,
</span><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><del>- CDC8F4D51725F73F00166F6E /* PBXTargetDependency */,
</del><span class="cx"> 510CC8511613C98D00D03ED3 /* PBXTargetDependency */,
</span><span class="cx"> );
</span><span class="cx"> name = NetworkProcess;
</span><span class="lines">@@ -8667,6 +8643,7 @@
</span><span class="cx"> 1AD98ECF191D867300CAA6DF /* Postprocess WKFoundation.h */,
</span><span class="cx"> 1A1D2115191D96380001619F /* Postprocess Framework Headers */,
</span><span class="cx"> 8DC2EF520486A6940098B216 /* Resources */,
</span><ins>+ 372589431C1E496800C92CA9 /* Copy Shims */,
</ins><span class="cx"> 7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
</span><span class="cx"> 37E531011B2391090074F0DF /* Copy iOS Sandbox Profiles for Manual Sandboxing */,
</span><span class="cx"> 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
</span><span class="lines">@@ -8683,6 +8660,9 @@
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><span class="cx"> 37F7407912721F740093869B /* PBXTargetDependency */,
</span><ins>+ 37B1D0141C1E421100D67FE9 /* PBXTargetDependency */,
+ 37B1D0161C1E421100D67FE9 /* PBXTargetDependency */,
+ 37B1D0181C1E421100D67FE9 /* PBXTargetDependency */,
</ins><span class="cx"> );
</span><span class="cx"> name = WebKit;
</span><span class="cx"> productInstallPath = "$(HOME)/Library/Frameworks";
</span><span class="lines">@@ -8824,13 +8804,11 @@
</span><span class="cx"> buildPhases = (
</span><span class="cx"> BCDE093813272496001259FB /* Resources */,
</span><span class="cx"> BCDE093A13272496001259FB /* Sources */,
</span><del>- BCDE093C13272496001259FB /* Copy Plug-in Process Shim */,
</del><span class="cx"> BC5D24B216CC3F3B007D5461 /* Frameworks */,
</span><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><del>- BCDE093413272496001259FB /* PBXTargetDependency */,
</del><span class="cx"> BCDE093613272496001259FB /* PBXTargetDependency */,
</span><span class="cx"> );
</span><span class="cx"> name = PluginProcess;
</span><span class="lines">@@ -9293,20 +9271,20 @@
</span><span class="cx"> );
</span><span class="cx"> name = "Copy XPC services for engineering builds";
</span><span class="cx"> outputPaths = (
</span><del>- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\&
quot; \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.Development.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.Development.xpc\" \"${
XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.Development.xpc\"\nfi\n";
</del><ins>+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}
/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.Development.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebK
it.Plugin.64.Development.xpc\"\nfi\n";
</ins><span class="cx"> };
</span><span class="cx"> C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -10356,6 +10334,21 @@
</span><span class="cx"> target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</span><span class="cx"> targetProxy = 375E063E191EAA33004E3CAF /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><ins>+ 37B1D0141C1E421100D67FE9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */;
+ targetProxy = 37B1D0131C1E421100D67FE9 /* PBXContainerItemProxy */;
+ };
+ 37B1D0161C1E421100D67FE9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 510031EA1379CACB00C8DFE4 /* SecItemShim */;
+ targetProxy = 37B1D0151C1E421100D67FE9 /* PBXContainerItemProxy */;
+ };
+ 37B1D0181C1E421100D67FE9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = CDC382FB17211799008A2FC3 /* WebProcessShim */;
+ targetProxy = 37B1D0171C1E421100D67FE9 /* PBXContainerItemProxy */;
+ };
</ins><span class="cx"> 37F7407912721F740093869B /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
</span><span class="lines">@@ -10426,11 +10419,6 @@
</span><span class="cx"> target = BCAE9DE8160C097400A33217 /* WebContent.Development */;
</span><span class="cx"> targetProxy = BCAE9DFC160C0AB000A33217 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- BCDE093413272496001259FB /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */;
- targetProxy = BCDE093513272496001259FB /* PBXContainerItemProxy */;
- };
</del><span class="cx"> BCDE093613272496001259FB /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</span><span class="lines">@@ -10441,16 +10429,6 @@
</span><span class="cx"> target = BCDE093313272496001259FB /* PluginProcess */;
</span><span class="cx"> targetProxy = BCDE0AC013272712001259FB /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- CDC3830A17211ABE008A2FC3 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = CDC382FB17211799008A2FC3 /* WebProcessShim */;
- targetProxy = CDC3830917211ABE008A2FC3 /* PBXContainerItemProxy */;
- };
- CDC8F4D51725F73F00166F6E /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 510031EA1379CACB00C8DFE4 /* SecItemShim */;
- targetProxy = CDC8F4D41725F73F00166F6E /* PBXContainerItemProxy */;
- };
</del><span class="cx"> E1B1B18D1A7AC1F5007B0965 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSX1091010plist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist (194021 => 194022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2015-12-14 03:19:47 UTC (rev 194022)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> <key>EnvironmentVariables</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>DYLD_INSERT_LIBRARIES</key>
</span><del>- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
</del><ins>+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/WebProcessShim.dylib</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span></span></pre>
</div>
</div>
</body>
</html>