<!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>[195854] tags/Safari-602.1.17.2</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/195854">195854</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-01-29 15:30:24 -0800 (Fri, 29 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/195795">r195795</a>. rdar://problem/24074990</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6021172SourceWebKit2ChangeLog">tags/Safari-602.1.17.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsBaseTargetxcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/BaseTarget.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsBaseXPCServicexcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/BaseXPCService.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsDatabaseServicexcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DatabaseService.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsDebugReleasexcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsNetworkServicexcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/NetworkService.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsPluginService32xcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.32.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsPluginService64xcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.64.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsWebContentServicexcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/WebContentService.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2DatabaseProcessEntryPointmacXPCServiceDatabaseServiceInfoplist">tags/Safari-602.1.17.2/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoOSX1091010plist">tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoOSXplist">tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoiOSplist">tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2PluginProcessEntryPointmacXPCServicePluginService32641091010Infoplist">tags/Safari-602.1.17.2/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainmm">tags/Safari-602.1.17.2/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">tags/Safari-602.1.17.2/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2WebKit2xcodeprojprojectpbxproj">tags/Safari-602.1.17.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSX1091010plist">tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSXplist">tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoiOSplist">tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist</a></li>
<li><a href="#tagsSafari6021172ToolsChangeLog">tags/Safari-602.1.17.2/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari6021172ToolsScriptswebkitdirspm">tags/Safari-602.1.17.2/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#tagsSafari6021172ToolsScriptswebkitpyportdriverpy">tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/driver.py</a></li>
<li><a href="#tagsSafari6021172ToolsScriptswebkitpyportiospy">tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/ios.py</a></li>
<li><a href="#tagsSafari6021172ToolsScriptswebkitpyportmacpy">tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/mac.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsDatabaseServiceDevelopmentxcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DatabaseService.Development.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsNetworkServiceDevelopmentxcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsPluginService32Developmentxcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.32.Development.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsPluginService64Developmentxcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.64.Development.xcconfig</a></li>
<li><a href="#tagsSafari6021172SourceWebKit2ConfigurationsWebContentServiceDevelopmentxcconfig">tags/Safari-602.1.17.2/Source/WebKit2/Configurations/WebContentService.Development.xcconfig</a></li>
<li>tags/Safari-602.1.17.2/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService.Development/</li>
<li>tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/</li>
<li>tags/Safari-602.1.17.2/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/</li>
<li><a href="#tagsSafari6021172SourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainDevelopmentmm">tags/Safari-602.1.17.2/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm</a></li>
<li>tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6021172SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/ChangeLog (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/ChangeLog 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/ChangeLog 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,3 +1,111 @@
</span><ins>+2016-01-29 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r195795.
+
+ 2016-01-28 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Use the non-Development variants of XPC services for development
+ https://bugs.webkit.org/show_bug.cgi?id=152545
+
+ Reviewed by Darin Adler.
+
+ The purpose of the Development variants of the WebKit XPC services is to allow the service
+ to link against the development WebKit dylibs rather than the system ones. Instead, we
+ accomplish this here by including dyld environment load commands in the normal services
+ when the WebKit dylibs are expected to be relocated. A new build setting,
+ WK_RELOCATABLE_FRAMEWORKS, controls this.
+
+ To make it easy to identify engineering builds of the services at runtime, they can be
+ given a distinctive suffix. A new build setting, WK_XPC_SERVICE_SUFFIX, controls this.
+
+ * Configurations/DebugRelease.xcconfig: Set WK_RELOCATABLE_FRAMEWORKS to YES and
+ WK_XPC_SERVICE_SUFFIX to ".Development".
+
+ * Configurations/BaseTarget.xcconfig: Make the quoted value of the WK_XPC_SERVICE_SUFFIX
+ build setting available as a preprocessor macro.
+
+ * Configurations/BaseXPCService.xcconfig:
+ - Simplify the definition of INSTALL_PATH now that there are no Development variants.
+ - Define WK_RELOCATABLE_FRAMEWORKS_LDFLAGS when building relocatable frameworks to include
+ -dyld_env options setting DYLD_FRAMEWORK_PATH to point to the directory containing
+ WebKit.framework and DYLD_LIBRARY_PATH to the framework’s Frameworks subdirectory. When
+ not building relocatable frameworks, define WK_RELOCATABLE_FRAMEWORKS_LDFLAGS to include
+ a -headerpad option allowing dyld environment load commands to be added after the fact.
+ - Add WK_RELOCATABLE_FRAMEWORKS_LDFLAGS to OTHER_LDFLAGS.
+ - Define WK_XPC_SERVICE_INSERT_LIBRARIES_DIR when building relocatable frameworks to be
+ the path to the Frameworks subdirectory of the WebKit framework containing the service.
+ When not building relocatable frameworks, define it to the absolute path of the
+ Frameworks subdirectory of the installed WebKit framework.
+
+ * Configurations/DatabaseService.xcconfig: Append WK_XPC_SERVICE_SUFFIX to PRODUCT_NAME,
+ and remove no-longer-used definition of WK_XPC_SERVICE_VARIANT.
+ * Configurations/NetworkService.xcconfig: Append WK_XPC_SERVICE_SUFFIX to PRODUCT_NAME, add
+ WK_RELOCATABLE_FRAMEWORKS_LDFLAGS to OTHER_LDFLAGS, and remove no-longer-used definition
+ of WK_XPC_SERVICE_VARIANT.
+ * Configurations/PluginService.32.xcconfig: Ditto.
+ * Configurations/PluginService.64.xcconfig: Ditto.
+ * Configurations/WebContentService.xcconfig: Ditto.
+
+ * Configurations/DatabaseService.Development.xcconfig: Removed.
+ * Configurations/NetworkService.Development.xcconfig: Removed.
+ * Configurations/PluginService.32.Development.xcconfig: Removed.
+ * Configurations/PluginService.64.Development.xcconfig: Removed.
+ * Configurations/WebContentService.Development.xcconfig: Removed.
+
+ * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService.Development: Removed.
+ * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService.Development/Info.plist: Removed.
+ * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist: Set
+ CFBundleIdentifier to PRODUCT_NAME in order to include the optional suffix.
+
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development: Removed.
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist: Removed.
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist: Removed.
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Set
+ CFBundleIdentifier to PRODUCT_NAME in order to include the optional suffix. Use
+ WK_XPC_SERVICE_INSERT_LIBRARIES_DIR in the value of DYLD_INSERT_LIBRARIES.
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist: Set
+ CFBundleIdentifier to PRODUCT_NAME in order to include the optional suffix.
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist: Ditto.
+
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Ditto.
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.Development: Removed.
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist: Removed.
+
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development: Removed.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist: Removed.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist: Removed.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Set
+ CFBundleIdentifier to PRODUCT_NAME in order to include the optional suffix. Use
+ WK_XPC_SERVICE_INSERT_LIBRARIES_DIR in the value of DYLD_INSERT_LIBRARIES.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: Set
+ CFBundleIdentifier to PRODUCT_NAME in order to include the optional suffix.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist: Ditto.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm: Removed.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
+ (WebKit::XPCServiceEventHandler): If stdout and stderr file descriptors are included in the
+ bootstrap message, hook them up to the serviceâs stdout and stderr, like the Development
+ services do.
+ (main): Moved code from XPCServiceMain.Development.mm to handle the optional
+ OverrideLanguages array.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::addDYLDEnvironmentAdditions): Addressed a FIXME.
+ (WebKit::serviceName): Removed forDevelopment argument and .Development service names.
+ Added WK_XPC_SERVICE_SUFFIX to the names.
+ (WebKit::connectToService): Updated for removal of forDevelopment argument. Removed
+ "framework-executable-path" key from the bootstrap message, because it was only used in
+ the Development variants.
+ (WebKit::connectToReExecService): Deleted.
+ (WebKit::createService): Removed call to connectToReExecService. Instead pass forDevelopment
+ to connectToService.
+
+ * WebKit2.xcodeproj/project.pbxproj: Removed references to removed files. Removed targets
+ for Development services. Removed Development services from script build phase that copies
+ services into the framework in engineering builds, and made it respect
+ WK_XPC_SERVICE_SUFFIX.
+
</ins><span class="cx"> 2016-01-19 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for DataDetectors in WK (iOS).
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/BaseTarget.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2010, 2012-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
</span><span class="cx">
</span><span class="cx"> GCC_PREFIX_HEADER = WebKit2Prefix.h;
</span><del>-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) FRAMEWORK_NAME=WebKit
</del><ins>+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) WK_XPC_SERVICE_SUFFIX=\"$(WK_XPC_SERVICE_SUFFIX)\" FRAMEWORK_NAME=WebKit;
</ins><span class="cx"> HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
</span><span class="cx">
</span><span class="cx"> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsBaseXPCServicexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/BaseXPCService.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2012-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,13 +23,9 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><del>-INSTALL_PATH = $(INSTALL_PATH_$(WK_XPC_SERVICE_VARIANT));
</del><ins>+INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
+INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
</ins><span class="cx">
</span><del>-INSTALL_PATH_Normal[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
-INSTALL_PATH_Normal[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
-
-INSTALL_PATH_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
-
</del><span class="cx"> APP_ICON = $(APP_ICON_$(CONFIGURATION));
</span><span class="cx"> APP_ICON_Debug = WebKit.icns;
</span><span class="cx"> APP_ICON_Release = WebKit.icns;
</span><span class="lines">@@ -43,8 +39,17 @@
</span><span class="cx"> WRAPPER_EXTENSION = xpc;
</span><span class="cx"> MACH_O_TYPE = mh_execute;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</del><ins>+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
</ins><span class="cx">
</span><ins>+WK_RELOCATABLE_FRAMEWORKS_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
+WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_ = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_NO);
+WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_NO = -Wl,-headerpad,0xC0; // Leave room for adding the dyld environment commands to a service that wasn't built for relocatable frameworks.
+WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_YES = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=@executable_path/$(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK)/..,-dyld_env,DYLD_LIBRARY_PATH=@executable_path/$(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK)/Frameworks;
+
+WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK = $(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_$(SHALLOW_BUNDLE));
+WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_NO = ../../../../../..;
+WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_YES = ../..;
+
</ins><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
</span><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_ = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_NO);
</span><span class="lines">@@ -57,3 +62,8 @@
</span><span class="cx">
</span><span class="cx"> WK_XPC_SERVICE_INFOPLIST_SUFFIX[sdk=macosx*] = $(WK_XPC_SERVICE_INFOPLIST_SUFFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> WK_XPC_SERVICE_INFOPLIST_SUFFIX_101000 = -10.9-10.10;
</span><ins>+
+WK_XPC_SERVICE_INSERT_LIBRARIES_DIR = $(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_$(WK_RELOCATABLE_FRAMEWORKS));
+WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_ = $(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_NO);
+WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_NO = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks;
+WK_XPC_SERVICE_INSERT_LIBRARIES_DIR_YES = @executable_path/$(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK)/Frameworks;
</ins></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsDatabaseServiceDevelopmentxcconfig"></a>
<div class="delfile"><h4>Deleted: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DatabaseService.Development.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DatabaseService.Development.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DatabaseService.Development.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-// Copyright (C) 2013 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "BaseXPCService.xcconfig"
-
-WK_XPC_SERVICE_VARIANT = Development;
-WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
-
-PRODUCT_NAME = com.apple.WebKit.Databases.Development;
-INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService.Development/Info.plist;
</del></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsDatabaseServicexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DatabaseService.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DatabaseService.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DatabaseService.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseXPCService.xcconfig"
</span><span class="cx">
</span><del>-WK_XPC_SERVICE_VARIANT = Normal;
</del><span class="cx"> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
</span><span class="cx">
</span><del>-PRODUCT_NAME = com.apple.WebKit.Databases;
</del><ins>+PRODUCT_NAME = com.apple.WebKit.Databases$(WK_XPC_SERVICE_SUFFIX);
</ins><span class="cx"> INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DebugRelease.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2009, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2009, 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -48,3 +48,6 @@
</span><span class="cx"> SDKROOT_macosx_YES = macosx.internal;
</span><span class="cx">
</span><span class="cx"> WK_MANUAL_SANDBOXING_ENABLED[sdk=iphoneos*] = YES;
</span><ins>+
+WK_RELOCATABLE_FRAMEWORKS = YES;
+WK_XPC_SERVICE_SUFFIX = .Development;
</ins></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsNetworkServiceDevelopmentxcconfig"></a>
<div class="delfile"><h4>Deleted: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-// Copyright (C) 2013 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "BaseXPCService.xcconfig"
-
-WK_XPC_SERVICE_VARIANT = Development;
-WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Network-iOS;
-
-PRODUCT_NAME = com.apple.WebKit.Networking.Development;
-INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist;
-INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist;
</del></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsNetworkServicexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/NetworkService.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/NetworkService.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/NetworkService.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2012-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,12 +23,11 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseXPCService.xcconfig"
</span><span class="cx">
</span><del>-WK_XPC_SERVICE_VARIANT = Normal;
</del><span class="cx"> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Network-iOS;
</span><span class="cx">
</span><del>-PRODUCT_NAME = com.apple.WebKit.Networking;
</del><ins>+PRODUCT_NAME = com.apple.WebKit.Networking$(WK_XPC_SERVICE_SUFFIX);
</ins><span class="cx"> INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
</span><span class="cx"> INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
</del><ins>+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM)) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
</ins><span class="cx"> OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsPluginService32Developmentxcconfig"></a>
<div class="delfile"><h4>Deleted: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.32.Development.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.32.Development.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.32.Development.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-// Copyright (C) 2013 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "BaseXPCService.xcconfig"
-
-WK_XPC_SERVICE_VARIANT = Development;
-
-VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(ONLY_ACTIVE_ARCH));
-VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
-VALID_ARCHS_macosx_NO = i386;
-
-PRODUCT_NAME = com.apple.WebKit.Plugin.32.Development;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;
-
-CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
-
-SKIP_INSTALL[sdk=iphone*] = YES;
-
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</del></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsPluginService32xcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.32.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.32.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.32.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,16 +23,14 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseXPCService.xcconfig"
</span><span class="cx">
</span><del>-WK_XPC_SERVICE_VARIANT = Normal;
-
</del><span class="cx"> VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(ONLY_ACTIVE_ARCH));
</span><span class="cx"> VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
</span><span class="cx"> VALID_ARCHS_macosx_NO = i386;
</span><span class="cx">
</span><del>-PRODUCT_NAME = com.apple.WebKit.Plugin.32;
</del><ins>+PRODUCT_NAME = com.apple.WebKit.Plugin.32$(WK_XPC_SERVICE_SUFFIX);
</ins><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</del><ins>+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
</ins><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
</span><span class="cx"> OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsPluginService64Developmentxcconfig"></a>
<div class="delfile"><h4>Deleted: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.64.Development.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.64.Development.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.64.Development.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-// Copyright (C) 2013 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "BaseXPCService.xcconfig"
-
-WK_XPC_SERVICE_VARIANT = Development;
-
-VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(ONLY_ACTIVE_ARCH));
-VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
-VALID_ARCHS_macosx_NO = x86_64;
-
-PRODUCT_NAME = com.apple.WebKit.Plugin.64.Development;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;
-
-CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
-
-SKIP_INSTALL[sdk=iphone*] = YES;
-
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</del></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsPluginService64xcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.64.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.64.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/PluginService.64.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,16 +23,14 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseXPCService.xcconfig"
</span><span class="cx">
</span><del>-WK_XPC_SERVICE_VARIANT = Normal;
-
</del><span class="cx"> VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(ONLY_ACTIVE_ARCH));
</span><span class="cx"> VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
</span><span class="cx"> VALID_ARCHS_macosx_NO = x86_64;
</span><span class="cx">
</span><del>-PRODUCT_NAME = com.apple.WebKit.Plugin.64;
</del><ins>+PRODUCT_NAME = com.apple.WebKit.Plugin.64$(WK_XPC_SERVICE_SUFFIX);
</ins><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</del><ins>+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
</ins><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
</span><span class="cx"> OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsWebContentServiceDevelopmentxcconfig"></a>
<div class="delfile"><h4>Deleted: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-// Copyright (C) 2012-2014 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "BaseXPCService.xcconfig"
-
-WK_XPC_SERVICE_VARIANT = Development;
-WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = WebContent-iOS;
-
-PRODUCT_NAME = com.apple.WebKit.WebContent.Development;
-INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist;
-INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist;
-
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</del></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2ConfigurationsWebContentServicexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Configurations/WebContentService.xcconfig (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Configurations/WebContentService.xcconfig 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Configurations/WebContentService.xcconfig 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2012-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,13 +23,12 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseXPCService.xcconfig"
</span><span class="cx">
</span><del>-WK_XPC_SERVICE_VARIANT = Normal;
</del><span class="cx"> WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = WebContent-iOS;
</span><span class="cx">
</span><del>-PRODUCT_NAME = com.apple.WebKit.WebContent;
</del><ins>+PRODUCT_NAME = com.apple.WebKit.WebContent$(WK_XPC_SERVICE_SUFFIX);
</ins><span class="cx"> INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
</span><span class="cx"> INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
</del><ins>+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
</ins><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
</span><span class="cx"> OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2DatabaseProcessEntryPointmacXPCServiceDatabaseServiceInfoplist"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> <key>CFBundleExecutable</key>
</span><span class="cx"> <string>${EXECUTABLE_NAME}</string>
</span><span class="cx"> <key>CFBundleIdentifier</key>
</span><del>- <string>com.apple.WebKit.Databases</string>
</del><ins>+ <string>${PRODUCT_NAME}</string>
</ins><span class="cx"> <key>CFBundleInfoDictionaryVersion</key>
</span><span class="cx"> <string>6.0</string>
</span><span class="cx"> <key>CFBundleName</key>
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoOSX1091010plist"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> <key>CFBundleExecutable</key>
</span><span class="cx"> <string>${EXECUTABLE_NAME}</string>
</span><span class="cx"> <key>CFBundleIdentifier</key>
</span><del>- <string>com.apple.WebKit.Networking</string>
</del><ins>+ <string>${PRODUCT_NAME}</string>
</ins><span class="cx"> <key>CFBundleInfoDictionaryVersion</key>
</span><span class="cx"> <string>6.0</string>
</span><span class="cx"> <key>CFBundleName</key>
</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/Frameworks/SecItemShim.dylib</string>
</del><ins>+ <string>$(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR)/SecItemShim.dylib</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoOSXplist"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> <key>CFBundleExecutable</key>
</span><span class="cx"> <string>${EXECUTABLE_NAME}</string>
</span><span class="cx"> <key>CFBundleIdentifier</key>
</span><del>- <string>com.apple.WebKit.Networking</string>
</del><ins>+ <string>${PRODUCT_NAME}</string>
</ins><span class="cx"> <key>CFBundleInfoDictionaryVersion</key>
</span><span class="cx"> <string>6.0</string>
</span><span class="cx"> <key>CFBundleName</key>
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoiOSplist"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> <key>CFBundleExecutable</key>
</span><span class="cx"> <string>${EXECUTABLE_NAME}</string>
</span><span class="cx"> <key>CFBundleIdentifier</key>
</span><del>- <string>com.apple.WebKit.Networking</string>
</del><ins>+ <string>${PRODUCT_NAME}</string>
</ins><span class="cx"> <key>CFBundleInfoDictionaryVersion</key>
</span><span class="cx"> <string>6.0</string>
</span><span class="cx"> <key>CFBundleName</key>
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2PluginProcessEntryPointmacXPCServicePluginService32641091010Infoplist"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2016-01-29 23:30:24 UTC (rev 195854)
</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/Frameworks/PluginProcessShim.dylib</string>
</del><ins>+ <string>$(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR)/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="tagsSafari6021172SourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainDevelopmentmm"></a>
<div class="delfile"><h4>Deleted: tags/Safari-602.1.17.2/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,187 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-
-#import <crt_externs.h>
-#import <dlfcn.h>
-#import <mach-o/dyld.h>
-#import <spawn.h>
-#import <stdio.h>
-#import <stdlib.h>
-#import <wtf/OSObjectPtr.h>
-#import <wtf/RetainPtr.h>
-#import <wtf/spi/darwin/XPCSPI.h>
-
-namespace WebKit {
-
-struct ReexecInfo {
- bool executableHeap;
- char** environment;
-};
-
-static NO_RETURN void reexec(ReexecInfo *info)
-{
- posix_spawnattr_t attr;
- posix_spawnattr_init(&attr);
-
- short flags = 0;
-
- // We just want to set the process state, not actually launch a new process,
- // so we are going to use the darwin extension to posix_spawn POSIX_SPAWN_SETEXEC
- // to act like a more full featured exec.
- flags |= POSIX_SPAWN_SETEXEC;
-
- sigset_t signalMaskSet;
- sigemptyset(&signalMaskSet);
- posix_spawnattr_setsigmask(&attr, &signalMaskSet);
- flags |= POSIX_SPAWN_SETSIGMASK;
-
- static const int allowExecutableHeapFlag = 0x2000;
- if (info->executableHeap)
- flags |= allowExecutableHeapFlag;
-
- posix_spawnattr_setflags(&attr, flags);
-
- char path[4 * PATH_MAX];
- uint32_t pathLength = sizeof(path);
- _NSGetExecutablePath(path, &pathLength);
-
- char** argv = *_NSGetArgv();
- const char* programName = argv[0];
- const char* args[] = { programName, 0 };
-
- pid_t processIdentifier = 0;
- posix_spawn(&processIdentifier, path, 0, &attr, const_cast<char**>(args), info->environment);
-
- posix_spawnattr_destroy(&attr);
-
- NSLog(@"Unable to re-exec for path: %s", path);
- exit(EXIT_FAILURE);
-}
-
-static NO_RETURN void reexecCallBack(CFRunLoopTimerRef timer, void *info)
-{
- reexec(static_cast<ReexecInfo *>(info));
-}
-
-static void XPCServiceEventHandler(xpc_connection_t peer)
-{
- xpc_connection_set_target_queue(peer, dispatch_get_main_queue());
- xpc_connection_set_event_handler(peer, ^(xpc_object_t event) {
- xpc_type_t type = xpc_get_type(event);
- if (type == XPC_TYPE_ERROR) {
- if (event == XPC_ERROR_CONNECTION_INVALID || event == XPC_ERROR_TERMINATION_IMMINENT) {
- // FIXME: Handle this case more gracefully.
- exit(EXIT_FAILURE);
- }
- } else {
- assert(type == XPC_TYPE_DICTIONARY);
-
- if (!strcmp(xpc_dictionary_get_string(event, "message-name"), "re-exec")) {
- ReexecInfo *info = static_cast<ReexecInfo *>(malloc(sizeof(ReexecInfo)));
-
- info->executableHeap = xpc_dictionary_get_bool(event, "executable-heap");
-
- xpc_object_t environmentArray = xpc_dictionary_get_value(event, "environment");
- size_t numberOfEnvironmentVariables = xpc_array_get_count(environmentArray);
- char** environment = static_cast<char **>(malloc((numberOfEnvironmentVariables + 1) * sizeof(char*)));
- for (size_t i = 0; i < numberOfEnvironmentVariables; ++i)
- environment[i] = strdup(xpc_array_get_string(environmentArray, i));
- environment[numberOfEnvironmentVariables] = 0;
- info->environment = environment;
-
- CFRunLoopTimerContext context = { 0, info, NULL, NULL, NULL };
- CFRunLoopTimerRef timer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 0, 0, 0, reexecCallBack, &context);
- CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes);
- }
-
- if (!strcmp(xpc_dictionary_get_string(event, "message-name"), "bootstrap")) {
- static void* frameworkLibrary = dlopen(xpc_dictionary_get_string(event, "framework-executable-path"), RTLD_NOW);
- if (!frameworkLibrary) {
- NSLog(@"Unable to load WebKit.framework at path: %s (Error: %s)", xpc_dictionary_get_string(event, "framework-executable-path"), dlerror());
- exit(EXIT_FAILURE);
- }
-
- CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
- CFStringRef entryPointFunctionName = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
-
- typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t);
- InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
- if (!initializerFunctionPtr) {
- NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (NSString *)entryPointFunctionName);
- exit(EXIT_FAILURE);
- }
-
- auto reply = adoptOSObject(xpc_dictionary_create_reply(event));
- xpc_dictionary_set_string(reply.get(), "message-name", "process-finished-launching");
- xpc_connection_send_message(xpc_dictionary_get_remote_connection(event), reply.get());
-
- dup2(xpc_dictionary_dup_fd(event, "stdout"), STDOUT_FILENO);
- dup2(xpc_dictionary_dup_fd(event, "stderr"), STDERR_FILENO);
-
- initializerFunctionPtr(peer, event);
- }
-
- // Leak a boost onto the NetworkProcess.
- if (!strcmp(xpc_dictionary_get_string(event, "message-name"), "pre-bootstrap"))
- xpc_retain(event);
- }
- });
-
- xpc_connection_resume(peer);
-}
-
-} // namespace WebKit;
-
-using namespace WebKit;
-
-int main(int argc, char** argv)
-{
- if (auto bootstrap = adoptOSObject(xpc_copy_bootstrap())) {
- if (xpc_object_t languages = xpc_dictionary_get_value(bootstrap.get(), "OverrideLanguages")) {
- NSDictionary *existingArguments = [[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain];
- NSMutableDictionary *newArguments = [existingArguments mutableCopy];
- RetainPtr<NSMutableArray *> newLanguages = adoptNS([[NSMutableArray alloc] init]);
- xpc_array_apply(languages, ^(size_t index, xpc_object_t value) {
- [newLanguages addObject:[NSString stringWithCString:xpc_string_get_string_ptr(value) encoding:NSUTF8StringEncoding]];
- return true;
- });
- [newArguments setValue:newLanguages.get() forKey:@"AppleLanguages"];
- [[NSUserDefaults standardUserDefaults] setVolatileDomain:newArguments forName:NSArgumentDomain];
- }
- }
-
-#if PLATFORM(MAC)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- // Workaround for <rdar://problem/20653234>, make XPC transactions work after re-exec.
- xpc_track_activity();
-#pragma clang diagnostic pop
-#endif
-
- xpc_main(XPCServiceEventHandler);
- return 0;
-}
</del></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #import <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #import <wtf/OSObjectPtr.h>
</span><ins>+#import <wtf/RetainPtr.h>
</ins><span class="cx"> #import <wtf/spi/darwin/XPCSPI.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -59,6 +60,14 @@
</span><span class="cx"> xpc_dictionary_set_string(reply.get(), "message-name", "process-finished-launching");
</span><span class="cx"> xpc_connection_send_message(xpc_dictionary_get_remote_connection(event), reply.get());
</span><span class="cx">
</span><ins>+ int fd = xpc_dictionary_dup_fd(event, "stdout");
+ if (fd != -1)
+ dup2(fd, STDOUT_FILENO);
+
+ fd = xpc_dictionary_dup_fd(event, "stderr");
+ if (fd != -1)
+ dup2(fd, STDERR_FILENO);
+
</ins><span class="cx"> initializerFunctionPtr(peer, event);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -77,8 +86,8 @@
</span><span class="cx">
</span><span class="cx"> int main(int argc, char** argv)
</span><span class="cx"> {
</span><ins>+ auto bootstrap = adoptOSObject(xpc_copy_bootstrap());
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- auto bootstrap = adoptOSObject(xpc_copy_bootstrap());
</del><span class="cx"> auto containerEnvironmentVariables = xpc_dictionary_get_value(bootstrap.get(), "ContainerEnvironmentVariables");
</span><span class="cx"> xpc_dictionary_apply(containerEnvironmentVariables, ^(const char *key, xpc_object_t value) {
</span><span class="cx"> setenv(key, xpc_string_get_string_ptr(value), 1);
</span><span class="lines">@@ -86,6 +95,22 @@
</span><span class="cx"> });
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (bootstrap) {
+ if (xpc_object_t languages = xpc_dictionary_get_value(bootstrap.get(), "OverrideLanguages")) {
+ @autoreleasepool {
+ NSDictionary *existingArguments = [[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain];
+ NSMutableDictionary *newArguments = [existingArguments mutableCopy];
+ RetainPtr<NSMutableArray *> newLanguages = adoptNS([[NSMutableArray alloc] init]);
+ xpc_array_apply(languages, ^(size_t index, xpc_object_t value) {
+ [newLanguages addObject:[NSString stringWithCString:xpc_string_get_string_ptr(value) encoding:NSUTF8StringEncoding]];
+ return true;
+ });
+ [newArguments setValue:newLanguages.get() forKey:@"AppleLanguages"];
+ [[NSUserDefaults standardUserDefaults] setVolatileDomain:newArguments forName:NSArgumentDomain];
+ }
+ }
+ }
+
</ins><span class="cx"> xpc_main(XPCServiceEventHandler);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
</ins><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><span class="lines">@@ -135,8 +135,7 @@
</span><span class="cx"> environmentVariables.appendValue("DYLD_INSERT_LIBRARIES", asanLibraryPath, ':');
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- // FIXME: In El Capitan and later, do this only for development builds, because in production, the executables link directly against the shims.
</del><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
</ins><span class="cx"> if (auto shimPath = computeProcessShimPath(launchOptions, webKitBundle)) {
</span><span class="cx"> // Make sure that the shim library file exists and insert it.
</span><span class="cx"> const char* processShimPath = [shimPath fileSystemRepresentation];
</span><span class="lines">@@ -149,37 +148,24 @@
</span><span class="cx">
</span><span class="cx"> typedef void (ProcessLauncher::*DidFinishLaunchingProcessFunction)(PlatformProcessIdentifier, IPC::Connection::Identifier);
</span><span class="cx">
</span><del>-static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptions, bool forDevelopment)
</del><ins>+static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptions)
</ins><span class="cx"> {
</span><span class="cx"> switch (launchOptions.processType) {
</span><span class="cx"> case ProcessLauncher::WebProcess:
</span><del>- if (forDevelopment)
- return "com.apple.WebKit.WebContent.Development";
- return "com.apple.WebKit.WebContent";
</del><ins>+ return "com.apple.WebKit.WebContent" WK_XPC_SERVICE_SUFFIX;
</ins><span class="cx"> case ProcessLauncher::NetworkProcess:
</span><del>- if (forDevelopment)
- return "com.apple.WebKit.Networking.Development";
- return "com.apple.WebKit.Networking";
</del><ins>+ return "com.apple.WebKit.Networking" WK_XPC_SERVICE_SUFFIX;
</ins><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case ProcessLauncher::DatabaseProcess:
</span><del>- if (forDevelopment)
- return "com.apple.WebKit.Databases.Development";
- return "com.apple.WebKit.Databases";
</del><ins>+ return "com.apple.WebKit.Databases" WK_XPC_SERVICE_SUFFIX;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> case ProcessLauncher::PluginProcess:
</span><span class="cx"> // FIXME: Support plugins that require an executable heap.
</span><del>- if (forDevelopment) {
- if (launchOptions.architecture == CPU_TYPE_X86)
- return "com.apple.WebKit.Plugin.32.Development";
- if (launchOptions.architecture == CPU_TYPE_X86_64)
- return "com.apple.WebKit.Plugin.64.Development";
- } else {
- if (launchOptions.architecture == CPU_TYPE_X86)
- return "com.apple.WebKit.Plugin.32";
- if (launchOptions.architecture == CPU_TYPE_X86_64)
- return "com.apple.WebKit.Plugin.64";
- }
</del><ins>+ if (launchOptions.architecture == CPU_TYPE_X86)
+ return "com.apple.WebKit.Plugin.32" WK_XPC_SERVICE_SUFFIX;
+ if (launchOptions.architecture == CPU_TYPE_X86_64)
+ return "com.apple.WebKit.Plugin.64" WK_XPC_SERVICE_SUFFIX;
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span><span class="lines">@@ -202,7 +188,7 @@
</span><span class="cx"> static void connectToService(const ProcessLauncher::LaunchOptions& launchOptions, bool forDevelopment, ProcessLauncher* that, DidFinishLaunchingProcessFunction didFinishLaunchingProcessFunction, UUIDHolder* instanceUUID)
</span><span class="cx"> {
</span><span class="cx"> // Create a connection to the WebKit XPC service.
</span><del>- auto connection = adoptOSObject(xpc_connection_create(serviceName(launchOptions, forDevelopment), 0));
</del><ins>+ auto connection = adoptOSObject(xpc_connection_create(serviceName(launchOptions), 0));
</ins><span class="cx"> xpc_connection_set_oneshot_instance(connection.get(), instanceUUID->uuid);
</span><span class="cx">
</span><span class="cx"> // Inherit UI process localization. It can be different from child process default localization:
</span><span class="lines">@@ -258,7 +244,6 @@
</span><span class="cx"> // FIXME: Switch to xpc_connection_set_bootstrap once it's available everywhere we need.
</span><span class="cx"> auto bootstrapMessage = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
</span><span class="cx"> xpc_dictionary_set_string(bootstrapMessage.get(), "message-name", "bootstrap");
</span><del>- xpc_dictionary_set_string(bootstrapMessage.get(), "framework-executable-path", [[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] executablePath] fileSystemRepresentation]);
</del><span class="cx">
</span><span class="cx"> xpc_dictionary_set_mach_send(bootstrapMessage.get(), "server-port", listeningPort);
</span><span class="cx"> mach_port_deallocate(mach_task_self(), listeningPort);
</span><span class="lines">@@ -311,77 +296,12 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void connectToReExecService(const ProcessLauncher::LaunchOptions& launchOptions, ProcessLauncher* that, DidFinishLaunchingProcessFunction didFinishLaunchingProcessFunction)
-{
- EnvironmentVariables environmentVariables;
- addDYLDEnvironmentAdditions(launchOptions, true, environmentVariables);
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
- if (launchOptions.processType == ProcessLauncher::PluginProcess) {
- // Tagged pointers break video in Flash, see bug 135354.
- environmentVariables.set("NSStringDisableTagged", "YES");
- }
-#endif
-
- // FIXME: This UUID should be stored on the ChildProcessProxy.
- RefPtr<UUIDHolder> instanceUUID = UUIDHolder::create();
-
- // FIXME: It would be nice if we could use OSObjectPtr for this connection as well, but we'd have to be careful
- // not to introduce any retain cycles in the call to xpc_connection_set_event_handler below.
- xpc_connection_t reExecConnection = xpc_connection_create(serviceName(launchOptions, true), 0);
- xpc_connection_set_oneshot_instance(reExecConnection, instanceUUID->uuid);
-
- // Keep the ProcessLauncher alive while we do the re-execing (balanced in event handler).
- that->ref();
-
- // We wait for the connection to tear itself down (indicated via an error event)
- // to indicate that the service instance re-execed itself, and is now ready to be
- // connected to.
- xpc_connection_set_event_handler(reExecConnection, ^(xpc_object_t event) {
- ASSERT(xpc_get_type(event) == XPC_TYPE_ERROR);
-
- connectToService(launchOptions, true, that, didFinishLaunchingProcessFunction, instanceUUID.get());
-
- // Release the connection.
- xpc_release(reExecConnection);
-
- // Other end of ref called before we setup the event handler.
- that->deref();
- });
- xpc_connection_resume(reExecConnection);
-
- xpc_object_t reExecMessage = xpc_dictionary_create(0, 0, 0);
- xpc_dictionary_set_string(reExecMessage, "message-name", "re-exec");
-
- xpc_object_t environment = xpc_array_create(0, 0);
- char** environmentPointer = environmentVariables.environmentPointer();
- Vector<CString> temps;
- for (size_t i = 0; environmentPointer[i]; ++i) {
- CString temp(environmentPointer[i], strlen(environmentPointer[i]));
- temps.append(temp);
-
- xpc_array_set_string(environment, XPC_ARRAY_APPEND, temp.data());
- }
- xpc_dictionary_set_value(reExecMessage, "environment", environment);
- xpc_release(environment);
-
- xpc_dictionary_set_bool(reExecMessage, "executable-heap", launchOptions.executableHeap);
-
- xpc_connection_send_message(reExecConnection, reExecMessage);
- xpc_release(reExecMessage);
-}
-
</del><span class="cx"> static void createService(const ProcessLauncher::LaunchOptions& launchOptions, bool forDevelopment, ProcessLauncher* that, DidFinishLaunchingProcessFunction didFinishLaunchingProcessFunction)
</span><span class="cx"> {
</span><del>- if (forDevelopment) {
- connectToReExecService(launchOptions, that, didFinishLaunchingProcessFunction);
- return;
- }
-
</del><span class="cx"> // Generate the uuid for the service instance we are about to create.
</span><span class="cx"> // FIXME: This UUID should be stored on the ChildProcessProxy.
</span><span class="cx"> RefPtr<UUIDHolder> instanceUUID = UUIDHolder::create();
</span><del>- connectToService(launchOptions, false, that, didFinishLaunchingProcessFunction, instanceUUID.get());
</del><ins>+ connectToService(launchOptions, forDevelopment, that, didFinishLaunchingProcessFunction, instanceUUID.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool tryPreexistingProcess(const ProcessLauncher::LaunchOptions& launchOptions, ProcessLauncher* that, DidFinishLaunchingProcessFunction didFinishLaunchingProcessFunction)
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -21,15 +21,10 @@
</span><span class="cx"> 510CC8481613C85300D03ED3 /* PBXTargetDependency */,
</span><span class="cx"> BCDE0AC113272712001259FB /* PBXTargetDependency */,
</span><span class="cx"> BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */,
</span><del>- BCAE9DFD160C0AB000A33217 /* PBXTargetDependency */,
</del><span class="cx"> 51A60B2E180CCF1700F3BF50 /* PBXTargetDependency */,
</span><del>- 51A60B30180CCF1700F3BF50 /* PBXTargetDependency */,
</del><span class="cx"> BC77F95616D0459100F8F78A /* PBXTargetDependency */,
</span><span class="cx"> BC82844616B4FF6600A278FE /* PBXTargetDependency */,
</span><del>- BC82844816B4FF6F00A278FE /* PBXTargetDependency */,
- E1B1B19C1A7AD133007B0965 /* PBXTargetDependency */,
</del><span class="cx"> BC8283D516B4C01F00A278FE /* PBXTargetDependency */,
</span><del>- BC8283D716B4C02200A278FE /* PBXTargetDependency */,
</del><span class="cx"> );
</span><span class="cx"> name = All;
</span><span class="cx"> productName = WebKit2;
</span><span class="lines">@@ -964,8 +959,6 @@
</span><span class="cx"> 517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */; };
</span><span class="cx"> 517DD5BF180DA7D30081660B /* DatabaseProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */; };
</span><span class="cx"> 517DD5C5180DC3E10081660B /* DatabaseProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */; };
</span><del>- 5180C715180CCA3100FDA612 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; };
- 5180C717180CCA3100FDA612 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</del><span class="cx"> 51834592134532E90092B696 /* WebIconDatabaseClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51834590134532E80092B696 /* WebIconDatabaseClient.cpp */; };
</span><span class="cx"> 51834593134532E90092B696 /* WebIconDatabaseClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 51834591134532E80092B696 /* WebIconDatabaseClient.h */; };
</span><span class="cx"> 518353DA1885BF8C00D9FE44 /* IDBSerialization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518353D81885BF8C00D9FE44 /* IDBSerialization.cpp */; };
</span><span class="lines">@@ -1469,9 +1462,6 @@
</span><span class="cx"> BC5D24A116CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
</span><span class="cx"> BC5D24A216CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
</span><span class="cx"> BC5D24A316CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
</span><del>- BC5D24A716CC3D5D007D5461 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; };
- BC5D24A816CC3D5E007D5461 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; };
- BC5D24AA16CC3D5F007D5461 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; };
</del><span class="cx"> BC5D24AB16CC3D62007D5461 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
</span><span class="cx"> BC5D24AC16CC3D63007D5461 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
</span><span class="cx"> BC5D24AE16CC3D65007D5461 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
</span><span class="lines">@@ -1566,10 +1556,7 @@
</span><span class="cx"> BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */; };
</span><span class="cx"> BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
</span><span class="cx"> BCAE9E08160C1C0700A33217 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
</span><del>- BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
- BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</del><span class="cx"> BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><del>- BCAF362216CA292B00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</del><span class="cx"> BCB63478116BF10600603215 /* WebKit2_C.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB63477116BF10600603215 /* WebKit2_C.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCB9E24B1120E15C00A137E0 /* WKContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9E2491120E15C00A137E0 /* WKContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCB9E24C1120E15C00A137E0 /* WKContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB9E24A1120E15C00A137E0 /* WKContext.cpp */; };
</span><span class="lines">@@ -1790,14 +1777,11 @@
</span><span class="cx"> E1A9A852169E2025002D7176 /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
</span><span class="cx"> E1AEA22F14687BDB00804569 /* WKFullKeyboardAccessWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E1AEA22D14687BDB00804569 /* WKFullKeyboardAccessWatcher.h */; };
</span><span class="cx"> E1AEA23014687BDB00804569 /* WKFullKeyboardAccessWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1AEA22E14687BDB00804569 /* WKFullKeyboardAccessWatcher.mm */; };
</span><del>- E1B1B1901A7AC1F5007B0965 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; };
- E1B1B1921A7AC1F5007B0965 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</del><span class="cx"> E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B78470163F24690007B692 /* RemoteNetworkingContext.h */; };
</span><span class="cx"> E1B78473163F253E0007B692 /* RemoteNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B78472163F253E0007B692 /* RemoteNetworkingContext.mm */; };
</span><span class="cx"> E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = E1CC1B8E12D7EADF00625838 /* PrintInfo.h */; };
</span><span class="cx"> E1CC1B9112D7EADF00625838 /* PrintInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */; };
</span><span class="cx"> E1D26A51175964D70095BFD1 /* WebContentProcess.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */; };
</span><del>- E1D26A52175964D90095BFD1 /* WebContentProcess.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */; };
</del><span class="cx"> E1D26A53175964D90095BFD1 /* WebContentProcess.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */; };
</span><span class="cx"> E1E552C416AE065F004ED653 /* SandboxInitialiationParametersMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1E552C216AE065E004ED653 /* SandboxInitialiationParametersMac.mm */; };
</span><span class="cx"> E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */; };
</span><span class="lines">@@ -1884,34 +1868,6 @@
</span><span class="cx"> remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
</span><span class="cx"> remoteInfo = WebKit;
</span><span class="cx"> };
</span><del>- 375E0636191EA9A7004E3CAF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = WebKit;
- };
- 375E0638191EA9AD004E3CAF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = WebKit;
- };
- 375E063A191EA9BA004E3CAF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = WebKit;
- };
- 375E063C191EA9C1004E3CAF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = WebKit;
- };
</del><span class="cx"> 375E063E191EAA33004E3CAF /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -1975,13 +1931,6 @@
</span><span class="cx"> remoteGlobalIDString = 51F7DC3F180CC93600212CA3;
</span><span class="cx"> remoteInfo = Databases;
</span><span class="cx"> };
</span><del>- 51A60B2F180CCF1700F3BF50 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 5180C713180CCA3100FDA612;
- remoteInfo = Databases.Development;
- };
</del><span class="cx"> 51FA1E1B180CCADE00C44BE9 /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -2003,13 +1952,6 @@
</span><span class="cx"> remoteGlobalIDString = BC8283B016B4BF7700A278FE;
</span><span class="cx"> remoteInfo = Networking;
</span><span class="cx"> };
</span><del>- BC8283D616B4C02200A278FE /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = BC8283C416B4BFA800A278FE;
- remoteInfo = Networking.Development;
- };
</del><span class="cx"> BC82844516B4FF6600A278FE /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -2017,13 +1959,6 @@
</span><span class="cx"> remoteGlobalIDString = BC82841E16B4FDF600A278FE;
</span><span class="cx"> remoteInfo = Plugin.64;
</span><span class="cx"> };
</span><del>- BC82844716B4FF6F00A278FE /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = BC82843116B4FE1300A278FE;
- remoteInfo = Plugin.64.Development;
- };
</del><span class="cx"> BCA8D46715BCE0D6009DC1F1 /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -2031,13 +1966,6 @@
</span><span class="cx"> remoteGlobalIDString = BC3DE46515A91763008D26FC;
</span><span class="cx"> remoteInfo = WebKit2Service;
</span><span class="cx"> };
</span><del>- BCAE9DFC160C0AB000A33217 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = BCAE9DE8160C097400A33217;
- remoteInfo = WebProcessServiceForWebKitDevelopment;
- };
</del><span class="cx"> BCDE093713272496001259FB /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -2052,20 +1980,6 @@
</span><span class="cx"> remoteGlobalIDString = BCDE093313272496001259FB;
</span><span class="cx"> remoteInfo = "Plugin Process";
</span><span class="cx"> };
</span><del>- E1B1B18E1A7AC1F5007B0965 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = WebKit;
- };
- E1B1B19B1A7AD133007B0965 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = E1B1B18C1A7AC1F5007B0965;
- remoteInfo = Plugin.64.Development;
- };
</del><span class="cx"> /* End PBXContainerItemProxy section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXCopyFilesBuildPhase section */
</span><span class="lines">@@ -2782,8 +2696,6 @@
</span><span class="cx"> 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKThumbnailView.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D6CD117189058A500E5A4A0 /* ViewSnapshotStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewSnapshotStore.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D6CD118189058A500E5A4A0 /* ViewSnapshotStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ViewSnapshotStore.mm; sourceTree = "<group>"; };
</span><del>- 2D70AB1318A1D51A00026D6E /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
- 2D70AB1418A1D57C00026D6E /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
</del><span class="cx"> 2D7303781A7C2B7500F8F487 /* WKPageNavigationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageNavigationClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D790A9C1AD7050D00AB90B3 /* _WKLayoutMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKLayoutMode.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D790A9E1AD7164900AB90B3 /* WKLayoutMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKLayoutMode.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3134,7 +3046,6 @@
</span><span class="cx"> 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseProcessProxy.cpp; path = Databases/DatabaseProcessProxy.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseProcessProxy.h; path = Databases/DatabaseProcessProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DatabaseProcessProxyMac.mm; path = Databases/mac/DatabaseProcessProxyMac.mm; sourceTree = "<group>"; };
</span><del>- 5180C71D180CCA3100FDA612 /* com.apple.WebKit.Databases.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Databases.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</del><span class="cx"> 51834590134532E80092B696 /* WebIconDatabaseClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabaseClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51834591134532E80092B696 /* WebIconDatabaseClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 518353D81885BF8C00D9FE44 /* IDBSerialization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBSerialization.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3158,7 +3069,6 @@
</span><span class="cx"> 51A555F4128C6C47009ABCEC /* WKContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuItem.h; sourceTree = "<group>"; };
</span><span class="cx"> 51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuItemTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 51A60B27180CCD9000F3BF50 /* DatabaseProcess.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DatabaseProcess.xcconfig; sourceTree = "<group>"; };
</span><del>- 51A60B28180CCD9000F3BF50 /* DatabaseService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DatabaseService.Development.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DatabaseService.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 51A728DC1B1BAD2D00102EEE /* WKBundleNavigationActionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleNavigationActionPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 51A7F2F2125BF820008AEB1D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3215,13 +3125,12 @@
</span><span class="cx"> 51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseProcessMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51E35203180F5D4B00E53BE9 /* DatabaseProcessMain.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseProcessMain.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51E35204180F5D4B00E53BE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><del>- 51E35206180F5D5900E53BE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</del><span class="cx"> 51E35207180F5D6100E53BE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><span class="cx"> 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseServiceEntryPoint.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51E3B67E16F266B3009968DC /* NetworkResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkResourceLoaderMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoaderMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebResourceLoaderMessages.h; sourceTree = "<group>"; };
</span><del>- 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Databases.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</del><ins>+ 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Databases.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</ins><span class="cx"> 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DatabaseProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleDOMWindowExtension.h; sourceTree = "<group>"; };
</span><span class="cx"> 51FA2D5A15211A1E00C1BA0B /* InjectedBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleDOMWindowExtension.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3621,7 +3530,7 @@
</span><span class="cx"> BC33E0D012408E8600360F3F /* InjectedBundleRangeHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleRangeHandle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC39C4331626366F008BC689 /* WKDOMRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKDOMRange.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC39C4341626366F008BC689 /* WKDOMRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMRange.h; sourceTree = "<group>"; };
</span><del>- BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContent.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</del><ins>+ BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</ins><span class="cx"> BC3DE46815A91763008D26FC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
</span><span class="cx"> BC4075D7124FF0270068F20A /* WKArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKArray.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC4075D8124FF0270068F20A /* WKArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKArray.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3733,21 +3642,16 @@
</span><span class="cx"> BC82838A16B45EF200A278FE /* PluginProcessMain.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessMain.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC82838D16B45FA600A278FE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><span class="cx"> BC82839616B47EC400A278FE /* XPCServiceMain.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceMain.mm; sourceTree = "<group>"; };
</span><del>- BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceMain.Development.mm; sourceTree = "<group>"; };
</del><span class="cx"> BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContentServiceEntryPoint.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC8283A316B4BD9100A278FE /* Info-OSX.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
</span><del>- BC8283A616B4BD9100A278FE /* Info-OSX.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
</del><span class="cx"> BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkServiceEntryPoint.mm; sourceTree = "<group>"; };
</span><del>- BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkService.Development.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkService.xcconfig; sourceTree = "<group>"; };
</span><del>- BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Networking.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
- BC8283C516B4BFA800A278FE /* com.apple.WebKit.Networking.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Networking.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</del><ins>+ BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Networking.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</ins><span class="cx"> BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginServiceEntryPoint.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC8283F216B4FC5300A278FE /* PluginService.32.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.32.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.64.xcconfig; sourceTree = "<group>"; };
</span><del>- BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.32.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
- BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.64.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
- BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.32.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</del><ins>+ BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.32.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.64.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</ins><span class="cx"> BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingArea.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC8452A61162C80900CAB9B5 /* DrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingArea.h; sourceTree = "<group>"; };
</span><span class="cx"> BC84EB1712A7100C0083F2DA /* WebPreferencesMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPreferencesMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3792,10 +3696,7 @@
</span><span class="cx"> BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageUIClient.h; sourceTree = "<group>"; };
</span><span class="cx"> BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseXPCService.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.xcconfig; sourceTree = "<group>"; };
</span><del>- BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.Development.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> BCACC44016B24CAA00B6E092 /* Info-OSX.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
</span><del>- BCACC44316B24CAA00B6E092 /* Info-OSX.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
- BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</del><span class="cx"> BCB63477116BF10600603215 /* WebKit2_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2_C.h; sourceTree = "<group>"; };
</span><span class="cx"> BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> BCB9E2491120E15C00A137E0 /* WKContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContext.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3817,8 +3718,6 @@
</span><span class="cx"> BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebPageProxy.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> BCBD3912125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageProxyMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCBD3913125BB1A800D2C29F /* WebPageProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageProxyMessages.h; sourceTree = "<group>"; };
</span><del>- BCBECDC016B5CE0D00047A1A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.64.Development.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> BCBECDE516B6416700047A1A /* XPCServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceEntryPoint.mm; sourceTree = "<group>"; };
</span><span class="cx"> BCBECDE616B6416700047A1A /* XPCServiceEntryPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCServiceEntryPoint.h; sourceTree = "<group>"; };
</span><span class="cx"> BCC43AB8127B95DC00317F16 /* PlatformPopupMenuData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformPopupMenuData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4040,8 +3939,6 @@
</span><span class="cx"> E1A31734134CEA80007C9A4F /* AttributedString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AttributedString.mm; sourceTree = "<group>"; };
</span><span class="cx"> E1AEA22D14687BDB00804569 /* WKFullKeyboardAccessWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFullKeyboardAccessWatcher.h; sourceTree = "<group>"; };
</span><span class="cx"> E1AEA22E14687BDB00804569 /* WKFullKeyboardAccessWatcher.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKFullKeyboardAccessWatcher.mm; sourceTree = "<group>"; };
</span><del>- E1B1B1981A7AC1F5007B0965 /* com.apple.WebKit.Plugin.64.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.64.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
- E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.32.Development.xcconfig; sourceTree = "<group>"; };
</del><span class="cx"> E1B78470163F24690007B692 /* RemoteNetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteNetworkingContext.h; path = NetworkProcess/RemoteNetworkingContext.h; sourceTree = "<group>"; };
</span><span class="cx"> E1B78472163F253E0007B692 /* RemoteNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteNetworkingContext.mm; sourceTree = "<group>"; };
</span><span class="cx"> E1CC1B8E12D7EADF00625838 /* PrintInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4106,14 +4003,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- 5180C716180CCA3100FDA612 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 5180C717180CCA3100FDA612 /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> 51F7DC42180CC93600212CA3 /* Frameworks */ = {
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -4176,14 +4065,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- BC8283C216B4BFA800A278FE /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> BC8283F616B4FDDE00A278FE /* Frameworks */ = {
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -4202,22 +4083,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- BC82842F16B4FE1300A278FE /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- BCAF362216CA292B00D4E9FC /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- BCAE9DE6160C097400A33217 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> BCDC308D15FDB99A006B6695 /* Frameworks */ = {
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -4234,30 +4099,17 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- E1B1B1911A7AC1F5007B0965 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- E1B1B1921A7AC1F5007B0965 /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> /* End PBXFrameworksBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXGroup section */
</span><span class="cx"> 034768DFFF38A50411DB9C8B /* Products */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 5180C71D180CCA3100FDA612 /* com.apple.WebKit.Databases.Development.xpc */,
- 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */,
- BC8283C516B4BFA800A278FE /* com.apple.WebKit.Networking.Development.xpc */,
- BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
- BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */,
- BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */,
- E1B1B1981A7AC1F5007B0965 /* com.apple.WebKit.Plugin.64.Development.xpc */,
- BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */,
- BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */,
- BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */,
</del><ins>+ 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.Development.xpc */,
+ BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.Development.xpc */,
+ BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */,
+ BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.Development.xpc */,
+ BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.Development.xpc */,
</ins><span class="cx"> 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */,
</span><span class="cx"> 510CC80E1613C79900D03ED3 /* NetworkProcess.app */,
</span><span class="cx"> BCDE094213272496001259FB /* PluginProcess.app */,
</span><span class="lines">@@ -4521,19 +4373,15 @@
</span><span class="cx"> BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */,
</span><span class="cx"> 51A60B27180CCD9000F3BF50 /* DatabaseProcess.xcconfig */,
</span><span class="cx"> A7BD9863194653D400D35698 /* Databases-iOS.entitlements */,
</span><del>- 51A60B28180CCD9000F3BF50 /* DatabaseService.Development.xcconfig */,
</del><span class="cx"> 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */,
</span><span class="cx"> 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
</span><span class="cx"> 1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
</span><span class="cx"> 7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */,
</span><span class="cx"> 510CC8461613C7C600D03ED3 /* NetworkProcess.xcconfig */,
</span><del>- BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */,
</del><span class="cx"> BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */,
</span><span class="cx"> BC122FA3132707F300F7EAC1 /* PluginProcess.xcconfig */,
</span><span class="cx"> A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */,
</span><del>- E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */,
</del><span class="cx"> BC8283F216B4FC5300A278FE /* PluginService.32.xcconfig */,
</span><del>- BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */,
</del><span class="cx"> BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
</span><span class="cx"> 5D442A5516D5856700AC3331 /* PluginService.entitlements */,
</span><span class="cx"> 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
</span><span class="lines">@@ -4542,7 +4390,6 @@
</span><span class="cx"> 1A4F976E100E7B6600637A18 /* Version.xcconfig */,
</span><span class="cx"> 7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
</span><span class="cx"> 5DAD7294116FF70B00EE5396 /* WebContentProcess.xcconfig */,
</span><del>- BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */,
</del><span class="cx"> BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
</span><span class="cx"> BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */,
</span><span class="cx"> A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */,
</span><span class="lines">@@ -5792,7 +5639,6 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> 51F7DC0D180CC43800212CA3 /* DatabaseService */,
</span><del>- 51F7DC0F180CC46F00212CA3 /* DatabaseService.Development */,
</del><span class="cx"> 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */,
</span><span class="cx"> );
</span><span class="cx"> name = XPCService;
</span><span class="lines">@@ -5807,14 +5653,6 @@
</span><span class="cx"> path = DatabaseService;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 51F7DC0F180CC46F00212CA3 /* DatabaseService.Development */ = {
- isa = PBXGroup;
- children = (
- 51E35206180F5D5900E53BE9 /* Info.plist */,
- );
- path = DatabaseService.Development;
- sourceTree = "<group>";
- };
</del><span class="cx"> 51FBB9C1132E079200F327B4 /* IconDatabase */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -6806,7 +6644,6 @@
</span><span class="cx"> children = (
</span><span class="cx"> BCBECDE616B6416700047A1A /* XPCServiceEntryPoint.h */,
</span><span class="cx"> BCBECDE516B6416700047A1A /* XPCServiceEntryPoint.mm */,
</span><del>- BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */,
</del><span class="cx"> BC82839616B47EC400A278FE /* XPCServiceMain.mm */,
</span><span class="cx"> );
</span><span class="cx"> name = XPCService;
</span><span class="lines">@@ -6856,7 +6693,6 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> BC8283A216B4BD9100A278FE /* NetworkService */,
</span><del>- BC8283A516B4BD9100A278FE /* NetworkService.Development */,
</del><span class="cx"> BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */,
</span><span class="cx"> );
</span><span class="cx"> name = XPCService;
</span><span class="lines">@@ -6873,20 +6709,10 @@
</span><span class="cx"> path = NetworkService;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- BC8283A516B4BD9100A278FE /* NetworkService.Development */ = {
- isa = PBXGroup;
- children = (
- 2D70AB1318A1D51A00026D6E /* Info-iOS.plist */,
- BC8283A616B4BD9100A278FE /* Info-OSX.plist */,
- );
- path = NetworkService.Development;
- sourceTree = "<group>";
- };
</del><span class="cx"> BC8283E216B4F8E200A278FE /* XPCService */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> BC8283E916B4F8E200A278FE /* PluginService */,
</span><del>- BCBECDBF16B5CE0D00047A1A /* PluginService.Development */,
</del><span class="cx"> BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */,
</span><span class="cx"> );
</span><span class="cx"> name = XPCService;
</span><span class="lines">@@ -6980,7 +6806,6 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> BCACC43F16B24CAA00B6E092 /* WebContentService */,
</span><del>- BCACC44216B24CAA00B6E092 /* WebContentService.Development */,
</del><span class="cx"> BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */,
</span><span class="cx"> );
</span><span class="cx"> name = XPCService;
</span><span class="lines">@@ -6997,23 +6822,6 @@
</span><span class="cx"> path = WebContentService;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- BCACC44216B24CAA00B6E092 /* WebContentService.Development */ = {
- isa = PBXGroup;
- children = (
- 2D70AB1418A1D57C00026D6E /* Info-iOS.plist */,
- BCACC44316B24CAA00B6E092 /* Info-OSX.plist */,
- );
- path = WebContentService.Development;
- sourceTree = "<group>";
- };
- BCBECDBF16B5CE0D00047A1A /* PluginService.Development */ = {
- isa = PBXGroup;
- children = (
- BCBECDC016B5CE0D00047A1A /* Info.plist */,
- );
- path = PluginService.Development;
- sourceTree = "<group>";
- };
</del><span class="cx"> BCC56F751159955E001CCAF9 /* mac */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -8555,24 +8363,6 @@
</span><span class="cx"> productReference = 510CC80E1613C79900D03ED3 /* NetworkProcess.app */;
</span><span class="cx"> productType = "com.apple.product-type.application";
</span><span class="cx"> };
</span><del>- 5180C713180CCA3100FDA612 /* Databases.Development */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 5180C719180CCA3100FDA612 /* Build configuration list for PBXNativeTarget "Databases.Development" */;
- buildPhases = (
- 5180C714180CCA3100FDA612 /* Sources */,
- 5180C716180CCA3100FDA612 /* Frameworks */,
- 5180C718180CCA3100FDA612 /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- 375E0637191EA9A7004E3CAF /* PBXTargetDependency */,
- );
- name = Databases.Development;
- productName = Networking.Development;
- productReference = 5180C71D180CCA3100FDA612 /* com.apple.WebKit.Databases.Development.xpc */;
- productType = "com.apple.product-type.bundle";
- };
</del><span class="cx"> 51F7DC3F180CC93600212CA3 /* Databases */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Databases" */;
</span><span class="lines">@@ -8588,7 +8378,7 @@
</span><span class="cx"> );
</span><span class="cx"> name = Databases;
</span><span class="cx"> productName = Networking;
</span><del>- productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */;
</del><ins>+ productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.Development.xpc */;
</ins><span class="cx"> productType = "com.apple.product-type.bundle";
</span><span class="cx"> };
</span><span class="cx"> 51FA1E17180CCADE00C44BE9 /* DatabaseProcess */ = {
</span><span class="lines">@@ -8663,7 +8453,7 @@
</span><span class="cx"> );
</span><span class="cx"> name = WebContent;
</span><span class="cx"> productName = WebKit2Service;
</span><del>- productReference = BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */;
</del><ins>+ productReference = BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.Development.xpc */;
</ins><span class="cx"> productType = "com.apple.product-type.bundle";
</span><span class="cx"> };
</span><span class="cx"> BC8283B016B4BF7700A278FE /* Networking */ = {
</span><span class="lines">@@ -8681,27 +8471,9 @@
</span><span class="cx"> );
</span><span class="cx"> name = Networking;
</span><span class="cx"> productName = Networking;
</span><del>- productReference = BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */;
</del><ins>+ productReference = BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.Development.xpc */;
</ins><span class="cx"> productType = "com.apple.product-type.bundle";
</span><span class="cx"> };
</span><del>- BC8283C416B4BFA800A278FE /* Networking.Development */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = BC8283D016B4BFA800A278FE /* Build configuration list for PBXNativeTarget "Networking.Development" */;
- buildPhases = (
- BC8283C116B4BFA800A278FE /* Sources */,
- BC8283C216B4BFA800A278FE /* Frameworks */,
- BC8283C316B4BFA800A278FE /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- 375E063B191EA9BA004E3CAF /* PBXTargetDependency */,
- );
- name = Networking.Development;
- productName = Networking.Development;
- productReference = BC8283C516B4BFA800A278FE /* com.apple.WebKit.Networking.Development.xpc */;
- productType = "com.apple.product-type.bundle";
- };
</del><span class="cx"> BC8283F816B4FDDE00A278FE /* Plugin.32 */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = BC82840416B4FDDE00A278FE /* Build configuration list for PBXNativeTarget "Plugin.32" */;
</span><span class="lines">@@ -8717,7 +8489,7 @@
</span><span class="cx"> );
</span><span class="cx"> name = Plugin.32;
</span><span class="cx"> productName = Plugin.32;
</span><del>- productReference = BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */;
</del><ins>+ productReference = BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */;
</ins><span class="cx"> productType = "com.apple.product-type.bundle";
</span><span class="cx"> };
</span><span class="cx"> BC82841E16B4FDF600A278FE /* Plugin.64 */ = {
</span><span class="lines">@@ -8735,45 +8507,9 @@
</span><span class="cx"> );
</span><span class="cx"> name = Plugin.64;
</span><span class="cx"> productName = Plugin.64;
</span><del>- productReference = BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */;
</del><ins>+ productReference = BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.Development.xpc */;
</ins><span class="cx"> productType = "com.apple.product-type.bundle";
</span><span class="cx"> };
</span><del>- BC82843116B4FE1300A278FE /* Plugin.32.Development */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = BC82843D16B4FE1400A278FE /* Build configuration list for PBXNativeTarget "Plugin.32.Development" */;
- buildPhases = (
- BC82842E16B4FE1300A278FE /* Sources */,
- BC82842F16B4FE1300A278FE /* Frameworks */,
- BC82843016B4FE1300A278FE /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- 375E0639191EA9AD004E3CAF /* PBXTargetDependency */,
- );
- name = Plugin.32.Development;
- productName = Plugin.64.Development;
- productReference = BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */;
- productType = "com.apple.product-type.bundle";
- };
- BCAE9DE8160C097400A33217 /* WebContent.Development */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = BCAE9DF6160C097500A33217 /* Build configuration list for PBXNativeTarget "WebContent.Development" */;
- buildPhases = (
- BCAE9DE5160C097400A33217 /* Sources */,
- BCAE9DE6160C097400A33217 /* Frameworks */,
- BCAE9DE7160C097400A33217 /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- 375E063D191EA9C1004E3CAF /* PBXTargetDependency */,
- );
- name = WebContent.Development;
- productName = WebProcessServiceForWebKitDevelopment;
- productReference = BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */;
- productType = "com.apple.product-type.bundle";
- };
</del><span class="cx"> BCDE093313272496001259FB /* PluginProcess */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = BCDE093E13272496001259FB /* Build configuration list for PBXNativeTarget "PluginProcess" */;
</span><span class="lines">@@ -8809,24 +8545,6 @@
</span><span class="cx"> productReference = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */;
</span><span class="cx"> productType = "com.apple.product-type.library.dynamic";
</span><span class="cx"> };
</span><del>- E1B1B18C1A7AC1F5007B0965 /* Plugin.64.Development */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = E1B1B1941A7AC1F5007B0965 /* Build configuration list for PBXNativeTarget "Plugin.64.Development" */;
- buildPhases = (
- E1B1B18F1A7AC1F5007B0965 /* Sources */,
- E1B1B1911A7AC1F5007B0965 /* Frameworks */,
- E1B1B1931A7AC1F5007B0965 /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- E1B1B18D1A7AC1F5007B0965 /* PBXTargetDependency */,
- );
- name = Plugin.64.Development;
- productName = Plugin.64.Development;
- productReference = E1B1B1981A7AC1F5007B0965 /* com.apple.WebKit.Plugin.64.Development.xpc */;
- productType = "com.apple.product-type.bundle";
- };
</del><span class="cx"> /* End PBXNativeTarget section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXProject section */
</span><span class="lines">@@ -8863,15 +8581,10 @@
</span><span class="cx"> 510031EA1379CACB00C8DFE4 /* SecItemShim */,
</span><span class="cx"> CDC382FB17211799008A2FC3 /* WebProcessShim */,
</span><span class="cx"> BC3DE46515A91763008D26FC /* WebContent */,
</span><del>- BCAE9DE8160C097400A33217 /* WebContent.Development */,
</del><span class="cx"> BC8283B016B4BF7700A278FE /* Networking */,
</span><del>- BC8283C416B4BFA800A278FE /* Networking.Development */,
</del><span class="cx"> BC8283F816B4FDDE00A278FE /* Plugin.32 */,
</span><span class="cx"> BC82841E16B4FDF600A278FE /* Plugin.64 */,
</span><del>- BC82843116B4FE1300A278FE /* Plugin.32.Development */,
- E1B1B18C1A7AC1F5007B0965 /* Plugin.64.Development */,
</del><span class="cx"> 51F7DC3F180CC93600212CA3 /* Databases */,
</span><del>- 5180C713180CCA3100FDA612 /* Databases.Development */,
</del><span class="cx"> A7AADA1019395CA9003EA1C7 /* Sandbox Profiles */,
</span><span class="cx"> );
</span><span class="cx"> };
</span><span class="lines">@@ -8895,13 +8608,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- 5180C718180CCA3100FDA612 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> 51F7DC45180CC93600212CA3 /* Resources */ = {
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -8943,13 +8649,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- BC8283C316B4BFA800A278FE /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> BC8283F716B4FDDE00A278FE /* Resources */ = {
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -8964,21 +8663,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- BC82843016B4FE1300A278FE /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- BCAE9DE7160C097400A33217 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- E1D26A52175964D90095BFD1 /* WebContentProcess.xib in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> BCDE093813272496001259FB /* Resources */ = {
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -8986,13 +8670,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- E1B1B1931A7AC1F5007B0965 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> /* End PBXResourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXShellScriptBuildPhase section */
</span><span class="lines">@@ -9234,33 +8911,23 @@
</span><span class="cx"> files = (
</span><span class="cx"> );
</span><span class="cx"> inputPaths = (
</span><del>- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.WebContent.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.WebContent.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Networking.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Networking.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Databases.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Databases.Development.xpc",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.WebContent$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Networking$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Databases$(WK_XPC_SERVICE_SUFFIX).xpc",
</ins><span class="cx"> );
</span><span class="cx"> name = "Copy XPC services for engineering builds";
</span><span class="cx"> outputPaths = (
</span><del>- "$(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",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases$(WK_XPC_SERVICE_SUFFIX).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}/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.Web
Kit.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${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent${WK_XPC_SERVICE_SUFFIX}.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking${WK_XPC_SERVICE_SUFFIX}.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases${WK_XPC_SERVICE_SUFFIX}.xpc\&qu
ot;\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32${WK_XPC_SERVICE_SUFFIX}.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64${WK_XPC_SERVICE_SUFFIX}.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">@@ -9311,14 +8978,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- 5180C714180CCA3100FDA612 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 5180C715180CCA3100FDA612 /* XPCServiceMain.Development.mm in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> 51F7DC40180CC93600212CA3 /* Sources */ = {
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -10155,14 +9814,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- BC8283C116B4BFA800A278FE /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- BC5D24A816CC3D5E007D5461 /* XPCServiceMain.Development.mm in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> BC8283F516B4FDDE00A278FE /* Sources */ = {
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -10179,22 +9830,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- BC82842E16B4FE1300A278FE /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- BC5D24AA16CC3D5F007D5461 /* XPCServiceMain.Development.mm in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- BCAE9DE5160C097400A33217 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- BC5D24A716CC3D5D007D5461 /* XPCServiceMain.Development.mm in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> BCDE093A13272496001259FB /* Sources */ = {
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -10212,14 +9847,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- E1B1B18F1A7AC1F5007B0965 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- E1B1B1901A7AC1F5007B0965 /* XPCServiceMain.Development.mm in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> /* End PBXSourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXTargetDependency section */
</span><span class="lines">@@ -10253,26 +9880,6 @@
</span><span class="cx"> target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</span><span class="cx"> targetProxy = 375E0632191EA909004E3CAF /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- 375E0637191EA9A7004E3CAF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit */;
- targetProxy = 375E0636191EA9A7004E3CAF /* PBXContainerItemProxy */;
- };
- 375E0639191EA9AD004E3CAF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit */;
- targetProxy = 375E0638191EA9AD004E3CAF /* PBXContainerItemProxy */;
- };
- 375E063B191EA9BA004E3CAF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit */;
- targetProxy = 375E063A191EA9BA004E3CAF /* PBXContainerItemProxy */;
- };
- 375E063D191EA9C1004E3CAF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit */;
- targetProxy = 375E063C191EA9C1004E3CAF /* PBXContainerItemProxy */;
- };
</del><span class="cx"> 375E063F191EAA33004E3CAF /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</span><span class="lines">@@ -10318,11 +9925,6 @@
</span><span class="cx"> target = 51F7DC3F180CC93600212CA3 /* Databases */;
</span><span class="cx"> targetProxy = 51A60B2D180CCF1700F3BF50 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- 51A60B30180CCF1700F3BF50 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 5180C713180CCA3100FDA612 /* Databases.Development */;
- targetProxy = 51A60B2F180CCF1700F3BF50 /* PBXContainerItemProxy */;
- };
</del><span class="cx"> 51FA1E1A180CCADE00C44BE9 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</span><span class="lines">@@ -10338,31 +9940,16 @@
</span><span class="cx"> target = BC8283B016B4BF7700A278FE /* Networking */;
</span><span class="cx"> targetProxy = BC8283D416B4C01F00A278FE /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- BC8283D716B4C02200A278FE /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = BC8283C416B4BFA800A278FE /* Networking.Development */;
- targetProxy = BC8283D616B4C02200A278FE /* PBXContainerItemProxy */;
- };
</del><span class="cx"> BC82844616B4FF6600A278FE /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = BC82841E16B4FDF600A278FE /* Plugin.64 */;
</span><span class="cx"> targetProxy = BC82844516B4FF6600A278FE /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- BC82844816B4FF6F00A278FE /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = BC82843116B4FE1300A278FE /* Plugin.32.Development */;
- targetProxy = BC82844716B4FF6F00A278FE /* PBXContainerItemProxy */;
- };
</del><span class="cx"> BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = BC3DE46515A91763008D26FC /* WebContent */;
</span><span class="cx"> targetProxy = BCA8D46715BCE0D6009DC1F1 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- BCAE9DFD160C0AB000A33217 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = BCAE9DE8160C097400A33217 /* WebContent.Development */;
- targetProxy = BCAE9DFC160C0AB000A33217 /* PBXContainerItemProxy */;
- };
</del><span class="cx"> BCDE093613272496001259FB /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</span><span class="lines">@@ -10373,16 +9960,6 @@
</span><span class="cx"> target = BCDE093313272496001259FB /* PluginProcess */;
</span><span class="cx"> targetProxy = BCDE0AC013272712001259FB /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- E1B1B18D1A7AC1F5007B0965 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit */;
- targetProxy = E1B1B18E1A7AC1F5007B0965 /* PBXContainerItemProxy */;
- };
- E1B1B19C1A7AD133007B0965 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = E1B1B18C1A7AC1F5007B0965 /* Plugin.64.Development */;
- targetProxy = E1B1B19B1A7AD133007B0965 /* PBXContainerItemProxy */;
- };
</del><span class="cx"> /* End PBXTargetDependency section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXVariantGroup section */
</span><span class="lines">@@ -10546,27 +10123,6 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><del>- 5180C71A180CCA3100FDA612 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 51A60B28180CCD9000F3BF50 /* DatabaseService.Development.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- 5180C71B180CCA3100FDA612 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 51A60B28180CCD9000F3BF50 /* DatabaseService.Development.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- 5180C71C180CCA3100FDA612 /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 51A60B28180CCD9000F3BF50 /* DatabaseService.Development.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
</del><span class="cx"> 51F7DC47180CC93600212CA3 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */;
</span><span class="lines">@@ -10708,27 +10264,6 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><del>- BC8283D116B4BFA800A278FE /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- BC8283D216B4BFA800A278FE /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- BC8283D316B4BFA800A278FE /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
</del><span class="cx"> BC82840516B4FDDE00A278FE /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = BC8283F216B4FC5300A278FE /* PluginService.32.xcconfig */;
</span><span class="lines">@@ -10771,48 +10306,6 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><del>- BC82843E16B4FE1400A278FE /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- BC82843F16B4FE1400A278FE /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- BC82844016B4FE1400A278FE /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
- BCAE9DF7160C097500A33217 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- BCAE9DF8160C097500A33217 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- BCAE9DF9160C097500A33217 /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
</del><span class="cx"> BCDE093F13272496001259FB /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = BC122FA3132707F300F7EAC1 /* PluginProcess.xcconfig */;
</span><span class="lines">@@ -10887,27 +10380,6 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><del>- E1B1B1951A7AC1F5007B0965 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- E1B1B1961A7AC1F5007B0965 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- E1B1B1971A7AC1F5007B0965 /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
</del><span class="cx"> /* End XCBuildConfiguration section */
</span><span class="cx">
</span><span class="cx"> /* Begin XCConfigurationList section */
</span><span class="lines">@@ -10981,16 +10453,6 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- 5180C719180CCA3100FDA612 /* Build configuration list for PBXNativeTarget "Databases.Development" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 5180C71A180CCA3100FDA612 /* Debug */,
- 5180C71B180CCA3100FDA612 /* Release */,
- 5180C71C180CCA3100FDA612 /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
</del><span class="cx"> 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Databases" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><span class="lines">@@ -11041,16 +10503,6 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- BC8283D016B4BFA800A278FE /* Build configuration list for PBXNativeTarget "Networking.Development" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- BC8283D116B4BFA800A278FE /* Debug */,
- BC8283D216B4BFA800A278FE /* Release */,
- BC8283D316B4BFA800A278FE /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
</del><span class="cx"> BC82840416B4FDDE00A278FE /* Build configuration list for PBXNativeTarget "Plugin.32" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><span class="lines">@@ -11071,26 +10523,6 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- BC82843D16B4FE1400A278FE /* Build configuration list for PBXNativeTarget "Plugin.32.Development" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- BC82843E16B4FE1400A278FE /* Debug */,
- BC82843F16B4FE1400A278FE /* Release */,
- BC82844016B4FE1400A278FE /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
- BCAE9DF6160C097500A33217 /* Build configuration list for PBXNativeTarget "WebContent.Development" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- BCAE9DF7160C097500A33217 /* Debug */,
- BCAE9DF8160C097500A33217 /* Release */,
- BCAE9DF9160C097500A33217 /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
</del><span class="cx"> BCDE093E13272496001259FB /* Build configuration list for PBXNativeTarget "PluginProcess" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><span class="lines">@@ -11121,16 +10553,6 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- E1B1B1941A7AC1F5007B0965 /* Build configuration list for PBXNativeTarget "Plugin.64.Development" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- E1B1B1951A7AC1F5007B0965 /* Debug */,
- E1B1B1961A7AC1F5007B0965 /* Release */,
- E1B1B1971A7AC1F5007B0965 /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
</del><span class="cx"> /* End XCConfigurationList section */
</span><span class="cx"> };
</span><span class="cx"> rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSX1091010plist"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> <key>CFBundleExecutable</key>
</span><span class="cx"> <string>${EXECUTABLE_NAME}</string>
</span><span class="cx"> <key>CFBundleIdentifier</key>
</span><del>- <string>com.apple.WebKit.WebContent</string>
</del><ins>+ <string>${PRODUCT_NAME}</string>
</ins><span class="cx"> <key>CFBundleInfoDictionaryVersion</key>
</span><span class="cx"> <string>6.0</string>
</span><span class="cx"> <key>CFBundleName</key>
</span><span class="lines">@@ -51,7 +51,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/Frameworks/WebProcessShim.dylib</string>
</del><ins>+ <string>$(WK_XPC_SERVICE_INSERT_LIBRARIES_DIR)/WebProcessShim.dylib</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSXplist"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> <key>CFBundleExecutable</key>
</span><span class="cx"> <string>${EXECUTABLE_NAME}</string>
</span><span class="cx"> <key>CFBundleIdentifier</key>
</span><del>- <string>com.apple.WebKit.WebContent</string>
</del><ins>+ <string>${PRODUCT_NAME}</string>
</ins><span class="cx"> <key>CFBundleInfoDictionaryVersion</key>
</span><span class="cx"> <string>6.0</string>
</span><span class="cx"> <key>CFBundleName</key>
</span></span></pre></div>
<a id="tagsSafari6021172SourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoiOSplist"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> <key>CFBundleExecutable</key>
</span><span class="cx"> <string>${EXECUTABLE_NAME}</string>
</span><span class="cx"> <key>CFBundleIdentifier</key>
</span><del>- <string>com.apple.WebKit.WebContent</string>
</del><ins>+ <string>${PRODUCT_NAME}</string>
</ins><span class="cx"> <key>CFBundleInfoDictionaryVersion</key>
</span><span class="cx"> <string>6.0</string>
</span><span class="cx"> <key>CFBundleName</key>
</span></span></pre></div>
<a id="tagsSafari6021172ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Tools/ChangeLog (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Tools/ChangeLog 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Tools/ChangeLog 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-01-29 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r195795.
+
+ 2016-01-28 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Use the non-Development variants of XPC services for development
+ https://bugs.webkit.org/show_bug.cgi?id=152545
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitdirs.pm:
+ (setUpGuardMallocIfNeeded): Ensure that libgmalloc is loaded into XPC services as well.
+
+ * Scripts/webkitpy/port/driver.py:
+ (Driver._setup_environ_for_driver): Ensure that the DYLD_LIBRARY_PATH and ASAN_OPTIONS are
+ set in the XPC services as well.
+
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.setup_environ_for_server): Ensure that malloc stack logging for leaks and
+ Guard Malloc are enabled in XPC services as well.
+
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.setup_environ_for_server): Ditto.
+
</ins><span class="cx"> 2016-01-19 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Runtime critical warnings when loading a URL after a session restore
</span></span></pre></div>
<a id="tagsSafari6021172ToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Tools/Scripts/webkitdirs.pm (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Tools/Scripts/webkitdirs.pm 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Tools/Scripts/webkitdirs.pm 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2005-2007, 2010-2015 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2005-2007, 2010-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2009 Google Inc. All rights reserved.
</span><span class="cx"> # Copyright (C) 2011 Research In Motion Limited. All rights reserved.
</span><span class="cx"> # Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="lines">@@ -1448,6 +1448,7 @@
</span><span class="cx">
</span><span class="cx"> if ($shouldUseGuardMalloc) {
</span><span class="cx"> appendToEnvironmentVariableList("DYLD_INSERT_LIBRARIES", "/usr/lib/libgmalloc.dylib");
</span><ins>+ appendToEnvironmentVariableList("__XPC_DYLD_INSERT_LIBRARIES", "/usr/lib/libgmalloc.dylib");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6021172ToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/driver.py (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/driver.py 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/driver.py 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> # Copyright (C) 2011 Google Inc. All rights reserved.
</span><del>-# Copyright (c) 2015, Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -313,6 +313,7 @@
</span><span class="cx">
</span><span class="cx"> def _setup_environ_for_driver(self, environment):
</span><span class="cx"> environment['DYLD_LIBRARY_PATH'] = str(self._port._build_path())
</span><ins>+ environment['__XPC_DYLD_LIBRARY_PATH'] = environment['DYLD_LIBRARY_PATH']
</ins><span class="cx"> environment['DYLD_FRAMEWORK_PATH'] = str(self._port._build_path())
</span><span class="cx"> # Use an isolated temp directory that can be deleted after testing (especially important on Mac, as
</span><span class="cx"> # CoreMedia disk cache is in the temp directory).
</span><span class="lines">@@ -322,6 +323,7 @@
</span><span class="cx"> environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
</span><span class="cx"> environment['LOCAL_RESOURCE_ROOT'] = str(self._port.layout_tests_dir())
</span><span class="cx"> environment['ASAN_OPTIONS'] = "allocator_may_return_null=1"
</span><ins>+ environment['__XPC_ASAN_OPTIONS'] = environment['ASAN_OPTIONS']
</ins><span class="cx"> if 'WEBKIT_OUTPUTDIR' in os.environ:
</span><span class="cx"> environment['WEBKIT_OUTPUTDIR'] = os.environ['WEBKIT_OUTPUTDIR']
</span><span class="cx"> if self._profiler:
</span></span></pre></div>
<a id="tagsSafari6021172ToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/ios.py (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/ios.py 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/ios.py 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -266,8 +266,10 @@
</span><span class="cx"> if server_name == self.driver_name():
</span><span class="cx"> if self.get_option('leaks'):
</span><span class="cx"> env['MallocStackLogging'] = '1'
</span><ins>+ env['__XPC_MallocStackLogging'] = '1'
</ins><span class="cx"> if self.get_option('guard_malloc'):
</span><span class="cx"> self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
</span><ins>+ self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
</ins><span class="cx"> self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
</span><span class="cx"> env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
</span><span class="cx"> return env
</span></span></pre></div>
<a id="tagsSafari6021172ToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/mac.py (195853 => 195854)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/mac.py 2016-01-29 23:30:09 UTC (rev 195853)
+++ tags/Safari-602.1.17.2/Tools/Scripts/webkitpy/port/mac.py 2016-01-29 23:30:24 UTC (rev 195854)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> # Copyright (C) 2011 Google Inc. All rights reserved.
</span><del>-# Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2012, 2013, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -101,8 +101,10 @@
</span><span class="cx"> if server_name == self.driver_name():
</span><span class="cx"> if self.get_option('leaks'):
</span><span class="cx"> env['MallocStackLogging'] = '1'
</span><ins>+ env['__XPC_MallocStackLogging'] = '1'
</ins><span class="cx"> if self.get_option('guard_malloc'):
</span><span class="cx"> self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
</span><ins>+ self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
</ins><span class="cx"> self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
</span><span class="cx"> env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
</span><span class="cx"> return env
</span></span></pre>
</div>
</div>
</body>
</html>