<!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>[180145] 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/180145">180145</a></dd>
<dt>Author</dt> <dd>g.czajkowski@samsung.com</dd>
<dt>Date</dt> <dd>2015-02-16 08:10:27 -0800 (Mon, 16 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Rename WebContextEfl to WebProcessPoolEfl
https://bugs.webkit.org/show_bug.cgi?id=141642
Reviewed by Csaba Osztrogonác.
Although we've renamed almost everything in <a href="http://trac.webkit.org/projects/webkit/changeset/177716">r177716</a>, this is still
required after <a href="http://trac.webkit.org/projects/webkit/changeset/177692">r177692</a>.
* UIProcess/efl/WebProcessPoolEfl.cpp: Renamed from Source/WebKit2/UIProcess/efl/WebContextEfl.cpp.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcesseflWebProcessPoolEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcesseflWebContextEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180144 => 180145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-16 15:15:22 UTC (rev 180144)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-16 16:10:27 UTC (rev 180145)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-16 Grzegorz Czajkowski <g.czajkowski@samsung.com>
+
+ [EFL] Rename WebContextEfl to WebProcessPoolEfl
+ https://bugs.webkit.org/show_bug.cgi?id=141642
+
+ Reviewed by Csaba Osztrogonác.
+
+ Although we've renamed almost everything in r177716, this is still
+ required after r177692.
+
+ * UIProcess/efl/WebProcessPoolEfl.cpp: Renamed from Source/WebKit2/UIProcess/efl/WebContextEfl.cpp.
+
</ins><span class="cx"> 2015-02-14 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix after <http://trac.webkit.org/changeset/180122>
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (180144 => 180145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-02-16 15:15:22 UTC (rev 180144)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-02-16 16:10:27 UTC (rev 180145)
</span><span class="lines">@@ -163,13 +163,13 @@
</span><span class="cx"> UIProcess/efl/WebColorPickerClient.cpp
</span><span class="cx"> UIProcess/efl/WebColorPickerEfl.cpp
</span><span class="cx"> UIProcess/efl/WebColorPickerResultListenerProxy.cpp
</span><del>- UIProcess/efl/WebContextEfl.cpp
</del><span class="cx"> UIProcess/efl/WebContextMenuProxyEfl.cpp
</span><span class="cx"> UIProcess/efl/WebInspectorProxyEfl.cpp
</span><span class="cx"> UIProcess/efl/WebPageProxyEfl.cpp
</span><span class="cx"> UIProcess/efl/WebPopupItemEfl.cpp
</span><span class="cx"> UIProcess/efl/WebPopupMenuListenerEfl.cpp
</span><span class="cx"> UIProcess/efl/WebPreferencesEfl.cpp
</span><ins>+ UIProcess/efl/WebProcessPoolEfl.cpp
</ins><span class="cx"> UIProcess/efl/WebProcessProxyEfl.cpp
</span><span class="cx"> UIProcess/efl/WebUIPopupMenuClient.cpp
</span><span class="cx"> UIProcess/efl/WebViewEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebContextEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (180144 => 180145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2015-02-16 15:15:22 UTC (rev 180144)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2015-02-16 16:10:27 UTC (rev 180145)
</span><span class="lines">@@ -1,146 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Samsung Electronics
- *
- * 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 "WebCookieManagerProxy.h"
-#include "WebProcessPool.h"
-
-#include "Logging.h"
-#include "WebInspectorServer.h"
-#include "WebProcessCreationParameters.h"
-#include "WebProcessMessages.h"
-#include "WebSoupCustomProtocolRequestManager.h"
-#include <Efreet.h>
-#include <WebCore/ApplicationCacheStorage.h>
-#include <WebCore/IconDatabase.h>
-#include <WebCore/NotImplemented.h>
-
-namespace WebKit {
-
-static void initializeInspectorServer()
-{
-#if ENABLE(INSPECTOR_SERVER)
- static bool initialized = false;
- if (initialized)
- return;
-
- // It should be set to true always.
- // Because it is to ensure initializeInspectorServer() is executed only once,
- // even if the server fails to run.
- initialized = true;
-
- String serverAddress(getenv("WEBKIT_INSPECTOR_SERVER"));
- if (!serverAddress.isNull()) {
- String bindAddress = ASCIILiteral("127.0.0.1");
- unsigned short port = 2999;
-
- Vector<String> result;
- serverAddress.split(':', result);
-
- if (result.size() == 2) {
- bindAddress = result[0];
- bool ok = false;
- port = result[1].toUInt(&ok);
- if (!ok) {
- port = 2999;
- LOG_ERROR("Couldn't parse the port. Using 2999 instead.");
- }
- } else
- LOG_ERROR("Couldn't parse %s, wrong format? Using 127.0.0.1:2999 instead.", serverAddress.utf8().data());
-
- if (!WebInspectorServer::singleton().listen(bindAddress, port))
- LOG_ERROR("Couldn't start listening on: IP address=%s, port=%d.", bindAddress.utf8().data(), port);
-
- return;
- }
-
- LOG(InspectorServer, "To start inspector server set WEBKIT_INSPECTOR_SERVER to 127.0.0.1:2999 for example.");
-#endif
-}
-
-String WebProcessPool::platformDefaultApplicationCacheDirectory() const
-{
- return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl/Applications";
-}
-
-void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
-{
- initializeInspectorServer();
-
- parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
- supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
- parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
- parameters.ignoreTLSErrors = m_ignoreTLSErrors;
-}
-
-void WebProcessPool::platformInvalidateContext()
-{
- notImplemented();
-}
-
-String WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory()
-{
- return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/Databases";
-}
-
-String WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory()
-{
- notImplemented();
- return String();
-}
-
-String WebProcessPool::platformDefaultIconDatabasePath() const
-{
- return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/IconDatabase/" + WebCore::IconDatabase::defaultDatabaseFilename();
-}
-
-String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory()
-{
- return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/LocalStorage";
-}
-
-String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
-{
- return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/MediaKeys";
-}
-
-String WebProcessPool::platformDefaultDiskCacheDirectory() const
-{
- return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
-}
-
-String WebProcessPool::platformDefaultCookieStorageDirectory() const
-{
- notImplemented();
- return String();
-}
-
-void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
-{
- m_ignoreTLSErrors = ignoreTLSErrors;
- sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors));
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebProcessPoolEflcppfromrev180144trunkSourceWebKit2UIProcesseflWebContextEflcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp (from rev 180144, trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp) (0 => 180145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp 2015-02-16 16:10:27 UTC (rev 180145)
</span><span class="lines">@@ -0,0 +1,146 @@
</span><ins>+/*
+ * Copyright (C) 2011 Samsung Electronics
+ *
+ * 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 "WebProcessPool.h"
+
+#include "Logging.h"
+#include "WebCookieManagerProxy.h"
+#include "WebInspectorServer.h"
+#include "WebProcessCreationParameters.h"
+#include "WebProcessMessages.h"
+#include "WebSoupCustomProtocolRequestManager.h"
+#include <Efreet.h>
+#include <WebCore/ApplicationCacheStorage.h>
+#include <WebCore/IconDatabase.h>
+#include <WebCore/NotImplemented.h>
+
+namespace WebKit {
+
+static void initializeInspectorServer()
+{
+#if ENABLE(INSPECTOR_SERVER)
+ static bool initialized = false;
+ if (initialized)
+ return;
+
+ // It should be set to true always.
+ // Because it is to ensure initializeInspectorServer() is executed only once,
+ // even if the server fails to run.
+ initialized = true;
+
+ String serverAddress(getenv("WEBKIT_INSPECTOR_SERVER"));
+ if (!serverAddress.isNull()) {
+ String bindAddress = ASCIILiteral("127.0.0.1");
+ unsigned short port = 2999;
+
+ Vector<String> result;
+ serverAddress.split(':', result);
+
+ if (result.size() == 2) {
+ bindAddress = result[0];
+ bool ok = false;
+ port = result[1].toUInt(&ok);
+ if (!ok) {
+ port = 2999;
+ LOG_ERROR("Couldn't parse the port. Using 2999 instead.");
+ }
+ } else
+ LOG_ERROR("Couldn't parse %s, wrong format? Using 127.0.0.1:2999 instead.", serverAddress.utf8().data());
+
+ if (!WebInspectorServer::singleton().listen(bindAddress, port))
+ LOG_ERROR("Couldn't start listening on: IP address=%s, port=%d.", bindAddress.utf8().data(), port);
+
+ return;
+ }
+
+ LOG(InspectorServer, "To start inspector server set WEBKIT_INSPECTOR_SERVER to 127.0.0.1:2999 for example.");
+#endif
+}
+
+String WebProcessPool::platformDefaultApplicationCacheDirectory() const
+{
+ return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl/Applications";
+}
+
+void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
+{
+ initializeInspectorServer();
+
+ parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
+ supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
+ parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
+ parameters.ignoreTLSErrors = m_ignoreTLSErrors;
+}
+
+void WebProcessPool::platformInvalidateContext()
+{
+ notImplemented();
+}
+
+String WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory()
+{
+ return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/Databases";
+}
+
+String WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory()
+{
+ notImplemented();
+ return String();
+}
+
+String WebProcessPool::platformDefaultIconDatabasePath() const
+{
+ return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/IconDatabase/" + WebCore::IconDatabase::defaultDatabaseFilename();
+}
+
+String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory()
+{
+ return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/LocalStorage";
+}
+
+String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
+{
+ return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/MediaKeys";
+}
+
+String WebProcessPool::platformDefaultDiskCacheDirectory() const
+{
+ return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
+}
+
+String WebProcessPool::platformDefaultCookieStorageDirectory() const
+{
+ notImplemented();
+ return String();
+}
+
+void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
+{
+ m_ignoreTLSErrors = ignoreTLSErrors;
+ sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors));
+}
+
+} // namespace WebKit
</ins></span></pre>
</div>
</div>
</body>
</html>