<!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>[200143] 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/200143">200143</a></dd>
<dt>Author</dt> <dd>csaavedra@igalia.com</dd>
<dt>Date</dt> <dd>2016-04-27 12:39:35 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][EFL] Move WK2 platform code to a common place
https://bugs.webkit.org/show_bug.cgi?id=157069
Reviewed by Carlos Garcia Campos.
Logging implementation can be shared between EFL and GTK, so move it to unix.
The GTK Module implementation doesn't depend on GTK anyhow so move it to glib.
* Platform/efl/LoggingEfl.cpp: Removed.
(WebKit::logLevelString): Deleted.
* Platform/glib/ModuleGlib.cpp: Renamed from Source/WebKit2/Platform/gtk/ModuleGtk.cpp.
(WebKit::Module::load):
(WebKit::Module::unload):
(WebKit::Module::platformFunctionPointer):
* Platform/gtk/LoggingGtk.cpp:
(WebKit::logLevelString): Deleted.
* Platform/gtk/ModuleGtk.cpp:
(WebKit::Module::load): Deleted.
(WebKit::Module::unload): Deleted.
(WebKit::Module::platformFunctionPointer): Deleted.
* Platform/unix/LoggingUnix.cpp: Renamed from Source/WebKit2/Platform/gtk/LoggingGtk.cpp.
(WebKit::logLevelString):
* PlatformEfl.cmake: Update.
* PlatformGTK.cmake: Update</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>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Platform/glib/</li>
<li><a href="#trunkSourceWebKit2PlatformglibModuleGlibcpp">trunk/Source/WebKit2/Platform/glib/ModuleGlib.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformunixLoggingUnixcpp">trunk/Source/WebKit2/Platform/unix/LoggingUnix.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2PlatformeflLoggingEflcpp">trunk/Source/WebKit2/Platform/efl/LoggingEfl.cpp</a></li>
<li>trunk/Source/WebKit2/Platform/gtk/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200142 => 200143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-27 19:30:01 UTC (rev 200142)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-27 19:39:35 UTC (rev 200143)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-04-27 Claudio Saavedra <csaavedra@igalia.com>
+
+ [GTK][EFL] Move WK2 platform code to a common place
+ https://bugs.webkit.org/show_bug.cgi?id=157069
+
+ Reviewed by Carlos Garcia Campos.
+
+ Logging implementation can be shared between EFL and GTK, so move it to unix.
+ The GTK Module implementation doesn't depend on GTK anyhow so move it to glib.
+
+ * Platform/efl/LoggingEfl.cpp: Removed.
+ (WebKit::logLevelString): Deleted.
+ * Platform/glib/ModuleGlib.cpp: Renamed from Source/WebKit2/Platform/gtk/ModuleGtk.cpp.
+ (WebKit::Module::load):
+ (WebKit::Module::unload):
+ (WebKit::Module::platformFunctionPointer):
+ * Platform/gtk/LoggingGtk.cpp:
+ (WebKit::logLevelString): Deleted.
+ * Platform/gtk/ModuleGtk.cpp:
+ (WebKit::Module::load): Deleted.
+ (WebKit::Module::unload): Deleted.
+ (WebKit::Module::platformFunctionPointer): Deleted.
+ * Platform/unix/LoggingUnix.cpp: Renamed from Source/WebKit2/Platform/gtk/LoggingGtk.cpp.
+ (WebKit::logLevelString):
+ * PlatformEfl.cmake: Update.
+ * PlatformGTK.cmake: Update
+
</ins><span class="cx"> 2016-04-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix assertion when downloading with NSURLSession after r198955
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformeflLoggingEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Platform/efl/LoggingEfl.cpp (200142 => 200143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/efl/LoggingEfl.cpp 2016-04-27 19:30:01 UTC (rev 200142)
+++ trunk/Source/WebKit2/Platform/efl/LoggingEfl.cpp 2016-04-27 19:39:35 UTC (rev 200143)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Samsung Electronics. All rights reserved.
- * 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.
- */
-
-#include "config.h"
-#include "Logging.h"
-
-#if !LOG_DISABLED
-
-namespace WebKit {
-
-String logLevelString()
-{
- return getenv("WEBKIT_DEBUG");
-}
-
-} // namespace WebKit
-
-#endif // !LOG_DISABLED
</del></span></pre></div>
<a id="trunkSourceWebKit2PlatformglibModuleGlibcppfromrev200142trunkSourceWebKit2PlatformgtkModuleGtkcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Platform/glib/ModuleGlib.cpp (from rev 200142, trunk/Source/WebKit2/Platform/gtk/ModuleGtk.cpp) (0 => 200143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/glib/ModuleGlib.cpp (rev 0)
+++ trunk/Source/WebKit2/Platform/glib/ModuleGlib.cpp 2016-04-27 19:39:35 UTC (rev 200143)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+ * Copyright (C) 2011 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 "Module.h"
+
+#include <gmodule.h>
+#include <wtf/text/CString.h>
+
+namespace WebKit {
+
+bool Module::load()
+{
+ m_handle = g_module_open(m_path.utf8().data(), G_MODULE_BIND_LAZY);
+ if (!m_handle)
+ WTFLogAlways("Error loading module '%s': %s", m_path.utf8().data(), g_module_error());
+ return m_handle;
+}
+
+void Module::unload()
+{
+ if (m_handle)
+ g_module_close(m_handle);
+}
+
+void* Module::platformFunctionPointer(const char* functionName) const
+{
+ gpointer symbol = 0;
+ g_module_symbol(m_handle, functionName, &symbol);
+ return symbol;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformunixLoggingUnixcppfromrev200142trunkSourceWebKit2PlatformgtkLoggingGtkcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Platform/unix/LoggingUnix.cpp (from rev 200142, trunk/Source/WebKit2/Platform/gtk/LoggingGtk.cpp) (0 => 200143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/unix/LoggingUnix.cpp (rev 0)
+++ trunk/Source/WebKit2/Platform/unix/LoggingUnix.cpp 2016-04-27 19:39:35 UTC (rev 200143)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * 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.
+ */
+
+#include "config.h"
+#include "Logging.h"
+
+namespace WebKit {
+
+#if !LOG_DISABLED
+
+String logLevelString()
+{
+ return getenv("WEBKIT_DEBUG");
+}
+
+#endif // !LOG_DISABLED
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (200142 => 200143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2016-04-27 19:30:01 UTC (rev 200142)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2016-04-27 19:39:35 UTC (rev 200143)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx"> Platform/IPC/unix/AttachmentUnix.cpp
</span><span class="cx"> Platform/IPC/unix/ConnectionUnix.cpp
</span><span class="cx">
</span><del>- Platform/efl/LoggingEfl.cpp
</del><span class="cx"> Platform/efl/ModuleEfl.cpp
</span><span class="cx">
</span><ins>+ Platform/unix/LoggingUnix.cpp
</ins><span class="cx"> Platform/unix/SharedMemoryUnix.cpp
</span><span class="cx">
</span><span class="cx"> PluginProcess/unix/PluginControllerProxyUnix.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (200142 => 200143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-04-27 19:30:01 UTC (rev 200142)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-04-27 19:39:35 UTC (rev 200143)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> Platform/IPC/unix/AttachmentUnix.cpp
</span><span class="cx"> Platform/IPC/unix/ConnectionUnix.cpp
</span><span class="cx">
</span><del>- Platform/gtk/LoggingGtk.cpp
- Platform/gtk/ModuleGtk.cpp
</del><ins>+ Platform/glib/ModuleGlib.cpp
</ins><span class="cx">
</span><ins>+ Platform/unix/LoggingUnix.cpp
</ins><span class="cx"> Platform/unix/SharedMemoryUnix.cpp
</span><span class="cx">
</span><span class="cx"> PluginProcess/unix/PluginControllerProxyUnix.cpp
</span><span class="lines">@@ -728,9 +728,9 @@
</span><span class="cx"> Platform/IPC/unix/AttachmentUnix.cpp
</span><span class="cx"> Platform/IPC/unix/ConnectionUnix.cpp
</span><span class="cx">
</span><del>- Platform/gtk/LoggingGtk.cpp
- Platform/gtk/ModuleGtk.cpp
</del><ins>+ Platform/glib/ModuleGlib.cpp
</ins><span class="cx">
</span><ins>+ Platform/unix/LoggingUnix.cpp
</ins><span class="cx"> Platform/unix/SharedMemoryUnix.cpp
</span><span class="cx">
</span><span class="cx"> PluginProcess/PluginControllerProxy.cpp
</span></span></pre>
</div>
</div>
</body>
</html>