<!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>[199480] releases/WebKitGTK/webkit-2.12/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/199480">199480</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-13 06:52:16 -0700 (Wed, 13 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/199002">r199002</a> - Fix WEB_PROCESS_CMD_PREFIX and NETWORK_PROCESS_CMD_PREFIX after <a href="http://trac.webkit.org/projects/webkit/changeset/196500">r196500</a>
https://bugs.webkit.org/show_bug.cgi?id=156060
Patch by Emanuele Aina <emanuele.aina@collabora.com> on 2016-04-04
Reviewed by Darin Adler.
Commit <a href="http://trac.webkit.org/projects/webkit/changeset/196500">r196500</a> was a bit too eager in removing the
platformGetLaunchOptions() callsites as non-mac platform still use
that in debug builds to attach debugging tools to spawned
subprocesses (eg. gdbserver).
Instead of reinstating them and relying on each subprocess type to
implement its own platformGetLaunchOptions() version (all alike),
avoid duplication and check the *_PROCESS_CMD_PREFIX environment
variables in a single place, ChildProcessProxy::getLaunchOptions().
Doing so also improves consistency in *_PROCESS_CMD_PREFIX support:
only WEB_PROCESS_CMD_PREFIX and NETWORK_PROCESS_CMD_PREFIX worked with
both the GTK and EFL ports while PLUGIN_PROCESS_CMD_PREFIX only
worked for EFL and there was no corresponding
DATABASE_PROCESS_CMD_PREFIX implementation.
* UIProcess/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::getLaunchOptions): Check the
appropriate *_PROCESS_CMD_PREFIX environment variable.
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
(WebKit::PluginProcessProxy::platformGetLaunchOptions): Drop
check for PLUGIN_PROCESS_COMMAND_PREFIX, now handled by
ChildProcessProxy::getLaunchOptions().
* UIProcess/Databases/DatabaseProcessProxy.h:
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/WebProcessProxy.h: Drop platformGetLaunchOptions()
prototypes.
* UIProcess/Network/soup/NetworkProcessProxySoup.cpp:
* UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp:
* UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp:
* UIProcess/efl/WebProcessProxyEfl.cpp:
* UIProcess/gtk/WebProcessProxyGtk.cpp: Removed, they only contained
platformGetLaunchOptions() implementations.
* PlatformEfl.cmake:
* PlatformGTK.cmake: Drop removed files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2PlatformGTKcmake">releases/WebKitGTK/webkit-2.12/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessChildProcessProxycpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/ChildProcessProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessDatabasesDatabaseProcessProxyh">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessNetworkNetworkProcessProxyh">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessWebProcessProxyh">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessDatabaseseflDatabaseProcessProxyEflcpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessDatabasesgtkDatabaseProcessProxyGtkcpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessNetworksoupNetworkProcessProxySoupcpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcesseflWebProcessProxyEflcpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/efl/WebProcessProxyEfl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2UIProcessgtkWebProcessProxyGtkcpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/gtk/WebProcessProxyGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2016-04-04 Emanuele Aina <emanuele.aina@collabora.com>
+
+ Fix WEB_PROCESS_CMD_PREFIX and NETWORK_PROCESS_CMD_PREFIX after r196500
+ https://bugs.webkit.org/show_bug.cgi?id=156060
+
+ Reviewed by Darin Adler.
+
+ Commit r196500 was a bit too eager in removing the
+ platformGetLaunchOptions() callsites as non-mac platform still use
+ that in debug builds to attach debugging tools to spawned
+ subprocesses (eg. gdbserver).
+
+ Instead of reinstating them and relying on each subprocess type to
+ implement its own platformGetLaunchOptions() version (all alike),
+ avoid duplication and check the *_PROCESS_CMD_PREFIX environment
+ variables in a single place, ChildProcessProxy::getLaunchOptions().
+
+ Doing so also improves consistency in *_PROCESS_CMD_PREFIX support:
+ only WEB_PROCESS_CMD_PREFIX and NETWORK_PROCESS_CMD_PREFIX worked with
+ both the GTK and EFL ports while PLUGIN_PROCESS_CMD_PREFIX only
+ worked for EFL and there was no corresponding
+ DATABASE_PROCESS_CMD_PREFIX implementation.
+
+ * UIProcess/ChildProcessProxy.cpp:
+ (WebKit::ChildProcessProxy::getLaunchOptions): Check the
+ appropriate *_PROCESS_CMD_PREFIX environment variable.
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::platformGetLaunchOptions): Drop
+ check for PLUGIN_PROCESS_COMMAND_PREFIX, now handled by
+ ChildProcessProxy::getLaunchOptions().
+ * UIProcess/Databases/DatabaseProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebProcessProxy.h: Drop platformGetLaunchOptions()
+ prototypes.
+ * UIProcess/Network/soup/NetworkProcessProxySoup.cpp:
+ * UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp:
+ * UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp:
+ * UIProcess/efl/WebProcessProxyEfl.cpp:
+ * UIProcess/gtk/WebProcessProxyGtk.cpp: Removed, they only contained
+ platformGetLaunchOptions() implementations.
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake: Drop removed files.
+
</ins><span class="cx"> 2016-04-01 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit should dispatchDidFailProvisionalLoad while loading invalid URLs
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/PlatformGTK.cmake (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/PlatformGTK.cmake 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/PlatformGTK.cmake 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -276,8 +276,6 @@
</span><span class="cx"> UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h
</span><span class="cx"> UIProcess/API/gtk/webkit2.h
</span><span class="cx">
</span><del>- UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp
-
</del><span class="cx"> UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
</span><span class="lines">@@ -288,8 +286,6 @@
</span><span class="cx"> UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp
</span><span class="cx"> UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp
</span><span class="cx">
</span><del>- UIProcess/Network/soup/NetworkProcessProxySoup.cpp
-
</del><span class="cx"> UIProcess/Plugins/gtk/PluginInfoCache.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
</span><span class="lines">@@ -320,7 +316,6 @@
</span><span class="cx"> UIProcess/gtk/WebPopupMenuProxyGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebPreferencesGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebProcessPoolGtk.cpp
</span><del>- UIProcess/gtk/WebProcessProxyGtk.cpp
</del><span class="cx">
</span><span class="cx"> UIProcess/soup/WebCookieManagerProxySoup.cpp
</span><span class="cx"> UIProcess/soup/WebProcessPoolSoup.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessChildProcessProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/ChildProcessProxy.cpp (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/ChildProcessProxy.cpp 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/ChildProcessProxy.cpp 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -60,6 +60,32 @@
</span><span class="cx"> {
</span><span class="cx"> if (const char* userDirectorySuffix = getenv("DIRHELPER_USER_DIR_SUFFIX"))
</span><span class="cx"> launchOptions.extraInitializationData.add(ASCIILiteral("user-directory-suffix"), userDirectorySuffix);
</span><ins>+
+#if !defined(NDEBUG) && (PLATFORM(GTK) || PLATFORM(EFL))
+ const char* varname;
+ switch (launchOptions.processType) {
+ case ProcessLauncher::ProcessType::Web:
+ varname = "WEB_PROCESS_CMD_PREFIX";
+ break;
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ case ProcessLauncher::ProcessType::Plugin64:
+ case ProcessLauncher::ProcessType::Plugin32:
+ varname = "PLUGIN_PROCESS_CMD_PREFIX";
+ break;
+#endif
+ case ProcessLauncher::ProcessType::Network:
+ varname = "NETWORK_PROCESS_CMD_PREFIX";
+ break;
+#if ENABLE(DATABASE_PROCESS)
+ case ProcessLauncher::ProcessType::Database:
+ varname = "DATABASE_PROCESS_CMD_PREFIX";
+ break;
+#endif
+ }
+ const char* processCmdPrefix = getenv(varname);
+ if (processCmdPrefix && *processCmdPrefix)
+ launchOptions.processCmdPrefix = String::fromUTF8(processCmdPrefix);
+#endif // !defined(NDEBUG) && (PLATFORM(GTK) || PLATFORM(EFL)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ChildProcessProxy::connect()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessDatabasesDatabaseProcessProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -79,8 +79,6 @@
</span><span class="cx"> // ProcessLauncher::Client
</span><span class="cx"> virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) override;
</span><span class="cx">
</span><del>- void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
-
</del><span class="cx"> WebProcessPool* m_processPool;
</span><span class="cx">
</span><span class="cx"> unsigned m_numPendingConnectionRequests;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessDatabaseseflDatabaseProcessProxyEflcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Naver Corp. 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.
- */
-
-#include "config.h"
-#include "DatabaseProcessProxy.h"
-
-#if ENABLE(DATABASE_PROCESS)
-
-namespace WebKit {
-
-void DatabaseProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions&)
-{
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessDatabasesgtkDatabaseProcessProxyGtkcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Igalia S.L.
- *
- * 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.
- */
-
-#include "config.h"
-#include "DatabaseProcessProxy.h"
-
-#if ENABLE(DATABASE_PROCESS)
-
-namespace WebKit {
-
-void DatabaseProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions&)
-{
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> virtual void connectionWillOpen(IPC::Connection&) override;
</span><span class="cx"> virtual void processWillShutDown(IPC::Connection&) override;
</span><span class="cx">
</span><del>- void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
</del><span class="cx"> void networkProcessCrashedOrFailedToLaunch();
</span><span class="cx">
</span><span class="cx"> // ProcessThrottlerClient
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessNetworksoupNetworkProcessProxySoupcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 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.
- */
-
-#include "config.h"
-
-#include "NetworkProcessProxy.h"
-#include <glib.h>
-
-namespace WebKit {
-
-void NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
-{
-#ifndef NDEBUG
- const char* networkProcessCmdPrefix = g_getenv("NETWORK_PROCESS_CMD_PREFIX");
- if (networkProcessCmdPrefix && *networkProcessCmdPrefix)
- launchOptions.processCmdPrefix = String::fromUTF8(networkProcessCmdPrefix);
-#else
- UNUSED_PARAM(launchOptions);
-#endif
-}
-
-}
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -54,12 +54,6 @@
</span><span class="cx"> {
</span><span class="cx"> launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
</span><span class="cx">
</span><del>-#if PLATFORM(EFL) && !defined(NDEBUG)
- const char* commandPrefix = getenv("PLUGIN_PROCESS_COMMAND_PREFIX");
- if (commandPrefix && *commandPrefix)
- launchOptions.processCmdPrefix = String::fromUTF8(commandPrefix);
-#endif
-
</del><span class="cx"> launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> if (pluginProcessAttributes.moduleInfo.requiresGtk2)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebProcessProxy.h (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -158,7 +158,6 @@
</span><span class="cx">
</span><span class="cx"> // From ChildProcessProxy
</span><span class="cx"> virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
</span><del>- void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
</del><span class="cx"> virtual void connectionWillOpen(IPC::Connection&) override;
</span><span class="cx"> virtual void processWillShutDown(IPC::Connection&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcesseflWebProcessProxyEflcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/efl/WebProcessProxyEfl.cpp (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/efl/WebProcessProxyEfl.cpp 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/efl/WebProcessProxyEfl.cpp 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 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.
- */
-
-#include "config.h"
-#include "WebProcessProxy.h"
-
-namespace WebKit {
-
-void WebProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
-{
-#ifndef NDEBUG
- const char* webProcessCmdPrefix = getenv("WEB_PROCESS_CMD_PREFIX");
- if (webProcessCmdPrefix && *webProcessCmdPrefix)
- launchOptions.processCmdPrefix = String::fromUTF8(webProcessCmdPrefix);
-#else
- UNUSED_PARAM(launchOptions);
-#endif
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2UIProcessgtkWebProcessProxyGtkcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/gtk/WebProcessProxyGtk.cpp (199479 => 199480)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/gtk/WebProcessProxyGtk.cpp 2016-04-13 13:47:16 UTC (rev 199479)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/gtk/WebProcessProxyGtk.cpp 2016-04-13 13:52:16 UTC (rev 199480)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 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.
- */
-
-#include "config.h"
-#include "WebProcessProxy.h"
-#include <glib.h>
-
-namespace WebKit {
-
-void WebProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
-{
-#ifndef NDEBUG
- const char* webProcessCmdPrefix = g_getenv("WEB_PROCESS_CMD_PREFIX");
- if (webProcessCmdPrefix && *webProcessCmdPrefix)
- launchOptions.processCmdPrefix = String::fromUTF8(webProcessCmdPrefix);
-#else
- UNUSED_PARAM(launchOptions);
-#endif
-}
-
-} // namespace WebKit
</del></span></pre>
</div>
</div>
</body>
</html>