<!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>[161020] 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/161020">161020</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2013-12-23 14:07:40 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][WK2] Simplify ProcessExecutablePathGtk
https://bugs.webkit.org/show_bug.cgi?id=126173
Reviewed by Martin Robinson.
Don't store process name strings in global variables -- each of the names is only used in the relevant
function, so the string can be directly passed into the findWebKitProcess function call.
Simplify the findWebKitProcess function. Make the execDirectory variable static so that g_getenv is only
called once, as it's not expected for the WEBKIT_EXEC_PATH environment variable to change during the runtime.
Introduce the getExecutablePath helper function that gets the current executable path and, if non-null, returns
the directory path of that executable. The helper function preserves the small performance improvement of querying
and processing the executable path only once.
The return value of getExecutablePath is stored in a static variable and is used to construct the process path
if the executable path was successfully retrieved.
* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::getExecutablePath):
(WebKit::findWebKitProcess):
(WebKit::executablePathOfWebProcess):
(WebKit::executablePathOfPluginProcess):
(WebKit::executablePathOfNetworkProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp">trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161019 => 161020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-23 22:05:48 UTC (rev 161019)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-23 22:07:40 UTC (rev 161020)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2013-12-23 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK][WK2] Simplify ProcessExecutablePathGtk
+ https://bugs.webkit.org/show_bug.cgi?id=126173
+
+ Reviewed by Martin Robinson.
+
+ Don't store process name strings in global variables -- each of the names is only used in the relevant
+ function, so the string can be directly passed into the findWebKitProcess function call.
+
+ Simplify the findWebKitProcess function. Make the execDirectory variable static so that g_getenv is only
+ called once, as it's not expected for the WEBKIT_EXEC_PATH environment variable to change during the runtime.
+
+ Introduce the getExecutablePath helper function that gets the current executable path and, if non-null, returns
+ the directory path of that executable. The helper function preserves the small performance improvement of querying
+ and processing the executable path only once.
+ The return value of getExecutablePath is stored in a static variable and is used to construct the process path
+ if the executable path was successfully retrieved.
+
+ * Shared/gtk/ProcessExecutablePathGtk.cpp:
+ (WebKit::getExecutablePath):
+ (WebKit::findWebKitProcess):
+ (WebKit::executablePathOfWebProcess):
+ (WebKit::executablePathOfPluginProcess):
+ (WebKit::executablePathOfNetworkProcess):
+
+2013-12-23 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Unreviewed build fix for GTK and EFL after r161007.
</span><span class="cx">
</span><span class="cx"> * UIProcess/DrawingAreaProxyImpl.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (161019 => 161020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2013-12-23 22:05:48 UTC (rev 161019)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2013-12-23 22:07:40 UTC (rev 161020)
</span><span class="lines">@@ -35,29 +35,24 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-const char* gWebKitWebProcessName = "WebKitWebProcess";
-const char* gWebKitPluginProcessName = "WebKitPluginProcess";
-const char* gWebKitNetworkProcessName = "WebKitNetworkProcess";
</del><ins>+static String getExecutablePath()
+{
+ CString executablePath = getCurrentExecutablePath();
+ if (!executablePath.isNull())
+ return directoryName(filenameToString(executablePath.data()));
+ return String();
+}
</ins><span class="cx">
</span><span class="cx"> static String findWebKitProcess(const char* processName)
</span><span class="cx"> {
</span><del>- const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
</del><ins>+ static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
</ins><span class="cx"> if (execDirectory) {
</span><span class="cx"> String processPath = pathByAppendingComponent(filenameToString(execDirectory), processName);
</span><span class="cx"> if (fileExists(processPath))
</span><span class="cx"> return processPath;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static bool gotExecutablePath = false;
- static String executablePath;
- if (!gotExecutablePath) {
- gotExecutablePath = true;
-
- CString executableFile = getCurrentExecutablePath();
- if (!executableFile.isNull())
- executablePath = directoryName(filenameToString(executableFile.data()));
- }
-
</del><ins>+ static String executablePath = getExecutablePath();
</ins><span class="cx"> if (!executablePath.isNull()) {
</span><span class="cx"> String processPath = pathByAppendingComponent(executablePath, processName);
</span><span class="cx"> if (fileExists(processPath))
</span><span class="lines">@@ -69,18 +64,18 @@
</span><span class="cx">
</span><span class="cx"> String executablePathOfWebProcess()
</span><span class="cx"> {
</span><del>- return findWebKitProcess(gWebKitWebProcessName);
</del><ins>+ return findWebKitProcess("WebKitWebProcess");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String executablePathOfPluginProcess()
</span><span class="cx"> {
</span><del>- return findWebKitProcess(gWebKitPluginProcessName);
</del><ins>+ return findWebKitProcess("WebKitPluginProcess");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> String executablePathOfNetworkProcess()
</span><span class="cx"> {
</span><del>- return findWebKitProcess(gWebKitNetworkProcessName);
</del><ins>+ return findWebKitProcess("WebKitNetworkProcess");
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>