<!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>[196500] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196500">196500</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-12 13:25:56 -0800 (Fri, 12 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove more unneeded process launching code
https://bugs.webkit.org/show_bug.cgi?id=154190
Reviewed by Tim Horton.
* UIProcess/Databases/DatabaseProcessProxy.cpp:
(WebKit::DatabaseProcessProxy::getLaunchOptions): Deleted.
* UIProcess/Databases/mac/DatabaseProcessProxyMac.mm: Removed.
(WebKit::DatabaseProcessProxy::platformGetLaunchOptions): Deleted.
* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::getLaunchOptions): Deleted.
* UIProcess/Network/mac/NetworkProcessProxyMac.mm:
(WebKit::NetworkProcessProxy::platformGetLaunchOptions): Deleted.
* UIProcess/Plugins/PluginProcessProxy.h:
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::pluginNeedsExecutableHeap): Deleted.
(WebKit::PluginProcessProxy::platformGetLaunchOptions): Deleted.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getLaunchOptions): Deleted.
* UIProcess/mac/WebProcessProxyMac.mm:
(WebKit::WebProcessProxy::platformGetLaunchOptions): Deleted.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp">trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLauncherh">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkmacNetworkProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebProcessProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WebKit2/UIProcess/Databases/mac/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2016-02-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove more unneeded process launching code
+ https://bugs.webkit.org/show_bug.cgi?id=154190
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::getLaunchOptions): Deleted.
+ * UIProcess/Databases/mac/DatabaseProcessProxyMac.mm: Removed.
+ (WebKit::DatabaseProcessProxy::platformGetLaunchOptions): Deleted.
+ * UIProcess/Launcher/ProcessLauncher.h:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::getLaunchOptions): Deleted.
+ * UIProcess/Network/mac/NetworkProcessProxyMac.mm:
+ (WebKit::NetworkProcessProxy::platformGetLaunchOptions): Deleted.
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::pluginNeedsExecutableHeap): Deleted.
+ (WebKit::PluginProcessProxy::platformGetLaunchOptions): Deleted.
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getLaunchOptions): Deleted.
+ * UIProcess/mac/WebProcessProxyMac.mm:
+ (WebKit::WebProcessProxy::platformGetLaunchOptions): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2016-02-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Use different process types for 32-bit and 64-bit plug-ins
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154186
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> {
</span><span class="cx"> launchOptions.processType = ProcessLauncher::ProcessType::Database;
</span><span class="cx"> ChildProcessProxy::getLaunchOptions(launchOptions);
</span><del>- platformGetLaunchOptions(launchOptions);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessProxy::processWillShutDown(IPC::Connection& connection)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLauncherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -60,16 +60,10 @@
</span><span class="cx"> struct LaunchOptions {
</span><span class="cx"> ProcessType processType;
</span><span class="cx"> HashMap<String, String> extraInitializationData;
</span><del>-#if OS(DARWIN) && !PLATFORM(GTK)
- static const cpu_type_t MatchCurrentArchitecture = 0;
- cpu_type_t architecture;
- bool executableHeap;
-#endif
-#if PLATFORM(EFL) || PLATFORM(GTK)
-#ifndef NDEBUG
</del><ins>+
+#if (PLATFORM(EFL) || PLATFORM(GTK)) && !defined(NDEBUG)
</ins><span class="cx"> String processCmdPrefix;
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<ProcessLauncher> create(Client* client, const LaunchOptions& launchOptions)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -82,7 +82,6 @@
</span><span class="cx"> {
</span><span class="cx"> launchOptions.processType = ProcessLauncher::ProcessType::Network;
</span><span class="cx"> ChildProcessProxy::getLaunchOptions(launchOptions);
</span><del>- platformGetLaunchOptions(launchOptions);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcessProxy::connectionWillOpen(IPC::Connection& connection)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkmacNetworkProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -40,10 +40,4 @@
</span><span class="cx"> connection()->send(Messages::NetworkProcess::SetProcessSuppressionEnabled(processSuppressionEnabled), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
-{
- launchOptions.architecture = ProcessLauncher::LaunchOptions::MatchCurrentArchitecture;
- launchOptions.executableHeap = false;
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -87,9 +87,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="cx">
</span><del>- // Returns whether the plug-in needs the heap to be marked executable.
- static bool pluginNeedsExecutableHeap(const PluginModuleInfo&);
-
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</span><span class="cx"> // Creates a property list in ~/Library/Preferences that contains all the MIME types supported by the plug-in.
</span><span class="cx"> static bool createPropertyListFile(const PluginModuleInfo&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -59,22 +59,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-bool PluginProcessProxy::pluginNeedsExecutableHeap(const PluginModuleInfo& pluginInfo)
-{
- static const bool forceNonexecutableHeapForPlugins = [[NSUserDefaults standardUserDefaults] boolForKey:@"ForceNonexecutableHeapForPlugins"];
- if (forceNonexecutableHeapForPlugins)
- return false;
-
- if (pluginInfo.bundleIdentifier == "com.apple.QuickTime Plugin.plugin")
- return false;
-
- // We only allow 32-bit plug-ins to have the heap marked executable.
- if (pluginInfo.pluginArchitecture == CPU_TYPE_X86)
- return true;
-
- return false;
-}
-
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</span><span class="cx"> bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
</span><span class="cx"> {
</span><span class="lines">@@ -118,8 +102,6 @@
</span><span class="cx"> else
</span><span class="cx"> launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
</span><span class="cx">
</span><del>- launchOptions.architecture = pluginProcessAttributes.moduleInfo.pluginArchitecture;
- launchOptions.executableHeap = PluginProcessProxy::pluginNeedsExecutableHeap(pluginProcessAttributes.moduleInfo);
</del><span class="cx"> launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
</span><span class="cx">
</span><span class="cx"> if (pluginProcessAttributes.sandboxPolicy == PluginProcessSandboxPolicyUnsandboxed) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -146,8 +146,6 @@
</span><span class="cx"> }
</span><span class="cx"> launchOptions.extraInitializationData.add(ASCIILiteral("OverrideLanguages"), languageString.toString());
</span><span class="cx"> }
</span><del>-
- platformGetLaunchOptions(launchOptions);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::connectionWillOpen(IPC::Connection& connection)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebProcessProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -40,13 +40,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
-{
- // We want the web process to match the architecture of the UI process.
- launchOptions.architecture = ProcessLauncher::LaunchOptions::MatchCurrentArchitecture;
- launchOptions.executableHeap = false;
-}
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -37,13 +37,6 @@
</span><span class="cx"> return [WKFullKeyboardAccessWatcher fullKeyboardAccessEnabled];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
-{
- // We want the web process to match the architecture of the UI process.
- launchOptions.architecture = ProcessLauncher::LaunchOptions::MatchCurrentArchitecture;
- launchOptions.executableHeap = false;
-}
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (196499 => 196500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-12 21:11:28 UTC (rev 196499)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-12 21:25:56 UTC (rev 196500)
</span><span class="lines">@@ -949,7 +949,6 @@
</span><span class="cx"> 517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; };
</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><del>- 517DD5C5180DC3E10081660B /* DatabaseProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */; };
</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">@@ -2955,7 +2954,6 @@
</span><span class="cx"> 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkProcessConnectionMessages.h; sourceTree = "<group>"; };
</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><del>- 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DatabaseProcessProxyMac.mm; path = Databases/mac/DatabaseProcessProxyMac.mm; sourceTree = "<group>"; };
</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">@@ -3275,8 +3273,8 @@
</span><span class="cx"> 93BDEB00171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageLoadTypesPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 93E6A4ED1BC5DD3900F8A0E7 /* _WKHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKHitTestResult.h; sourceTree = "<group>"; };
</span><span class="cx"> 990D28A71C6404B000986977 /* _WKAutomationSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAutomationSession.h; sourceTree = "<group>"; };
</span><del>- 990D28AD1C65190400986977 /* _WKAutomationSession.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKAutomationSession.mm; sourceTree = "<group>"; };
</del><span class="cx"> 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAutomationSessionDelegate.h; sourceTree = "<group>"; };
</span><ins>+ 990D28AD1C65190400986977 /* _WKAutomationSession.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKAutomationSession.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAutomationSessionInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 990D28B31C6526D400986977 /* APIAutomationSessionClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIAutomationSessionClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 990D28B51C6526F500986977 /* WebAutomationSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAutomationSession.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5385,7 +5383,6 @@
</span><span class="cx"> 517DD5BB180DA7C40081660B /* Databases */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 517DD5C3180DC3D60081660B /* mac */,
</del><span class="cx"> 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */,
</span><span class="cx"> 517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */,
</span><span class="cx"> 512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */,
</span><span class="lines">@@ -5403,14 +5400,6 @@
</span><span class="cx"> path = mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 517DD5C3180DC3D60081660B /* mac */ = {
- isa = PBXGroup;
- children = (
- 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */,
- );
- name = mac;
- sourceTree = "<group>";
- };
</del><span class="cx"> 518E8EF116B208F000E91429 /* Authentication */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -8802,7 +8791,6 @@
</span><span class="cx"> 51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */,
</span><span class="cx"> 512A9760180E031D0039A149 /* DatabaseProcessMessageReceiver.cpp in Sources */,
</span><span class="cx"> 517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */,
</span><del>- 517DD5C5180DC3E10081660B /* DatabaseProcessProxyMac.mm in Sources */,
</del><span class="cx"> 512A9769180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */,
</span><span class="cx"> 51E35200180F5D0F00E53BE9 /* DatabaseToWebProcessConnection.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>