<!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>[187191] 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/187191">187191</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-22 15:51:35 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Support indexeddb for WK2
https://bugs.webkit.org/show_bug.cgi?id=145867
Reviewed by Csaba Osztrogonác.
Add stub implementation for indexeddb. Move KeyedDecoder and KeyedEncoder from gtk to glib
in order to share it between GTK and EFL ports.
* DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp:
* DatabaseProcess/efl/DatabaseProcessMainEfl.cpp: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
(WebKit::DatabaseProcessMainUnix):
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* Shared/glib/KeyedDecoder.cpp: Renamed from Source/WebKit2/Shared/gtk/KeyedDecoder.cpp.
(WebKit::KeyedDecoder::KeyedDecoder):
(WebKit::KeyedDecoder::~KeyedDecoder):
(WebKit::KeyedDecoder::dictionaryFromGVariant):
(WebKit::KeyedDecoder::decodeBytes):
(WebKit::KeyedDecoder::decodeSimpleValue):
(WebKit::KeyedDecoder::decodeBool):
(WebKit::KeyedDecoder::decodeUInt32):
(WebKit::KeyedDecoder::decodeInt32):
(WebKit::KeyedDecoder::decodeInt64):
(WebKit::KeyedDecoder::decodeFloat):
(WebKit::KeyedDecoder::decodeDouble):
(WebKit::KeyedDecoder::decodeString):
(WebKit::KeyedDecoder::beginObject):
(WebKit::KeyedDecoder::endObject):
(WebKit::KeyedDecoder::beginArray):
(WebKit::KeyedDecoder::beginArrayElement):
(WebKit::KeyedDecoder::endArrayElement):
(WebKit::KeyedDecoder::endArray):
* Shared/glib/KeyedDecoder.h: Renamed from Source/WebKit2/Shared/gtk/KeyedDecoder.h.
* Shared/glib/KeyedEncoder.cpp: Renamed from Source/WebKit2/Shared/gtk/KeyedEncoder.cpp.
(WebKit::KeyedEncoder::KeyedEncoder):
(WebKit::KeyedEncoder::~KeyedEncoder):
(WebKit::KeyedEncoder::encodeBytes):
(WebKit::KeyedEncoder::encodeBool):
(WebKit::KeyedEncoder::encodeUInt32):
(WebKit::KeyedEncoder::encodeInt32):
(WebKit::KeyedEncoder::encodeInt64):
(WebKit::KeyedEncoder::encodeFloat):
(WebKit::KeyedEncoder::encodeDouble):
(WebKit::KeyedEncoder::encodeString):
(WebKit::KeyedEncoder::beginObject):
(WebKit::KeyedEncoder::endObject):
(WebKit::KeyedEncoder::beginArray):
(WebKit::KeyedEncoder::beginArrayElement):
(WebKit::KeyedEncoder::endArrayElement):
(WebKit::KeyedEncoder::endArray):
(WebKit::KeyedEncoder::finishEncoding):
* Shared/glib/KeyedEncoder.h: Renamed from Source/WebKit2/Shared/gtk/KeyedEncoder.h.
* UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
(WebKit::DatabaseProcessProxy::platformGetLaunchOptions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessEntryPointunixDatabaseProcessMaincpp">trunk/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp</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/DatabaseProcess/efl/</li>
<li><a href="#trunkSourceWebKit2DatabaseProcesseflDatabaseProcessMainEflcpp">trunk/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp</a></li>
<li>trunk/Source/WebKit2/Shared/glib/</li>
<li><a href="#trunkSourceWebKit2SharedglibKeyedDecodercpp">trunk/Source/WebKit2/Shared/glib/KeyedDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedglibKeyedDecoderh">trunk/Source/WebKit2/Shared/glib/KeyedDecoder.h</a></li>
<li><a href="#trunkSourceWebKit2SharedglibKeyedEncodercpp">trunk/Source/WebKit2/Shared/glib/KeyedEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedglibKeyedEncoderh">trunk/Source/WebKit2/Shared/glib/KeyedEncoder.h</a></li>
<li>trunk/Source/WebKit2/UIProcess/Databases/efl/</li>
<li><a href="#trunkSourceWebKit2UIProcessDatabaseseflDatabaseProcessProxyEflcpp">trunk/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedgtkKeyedDecodercpp">trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkKeyedDecoderh">trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkKeyedEncodercpp">trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkKeyedEncoderh">trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187190 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-22 22:09:35 UTC (rev 187190)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2015-07-22 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL] Support indexeddb for WK2
+ https://bugs.webkit.org/show_bug.cgi?id=145867
+
+ Reviewed by Csaba Osztrogonác.
+
+ Add stub implementation for indexeddb. Move KeyedDecoder and KeyedEncoder from gtk to glib
+ in order to share it between GTK and EFL ports.
+
+ * DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp:
+ * DatabaseProcess/efl/DatabaseProcessMainEfl.cpp: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
+ (WebKit::DatabaseProcessMainUnix):
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * Shared/glib/KeyedDecoder.cpp: Renamed from Source/WebKit2/Shared/gtk/KeyedDecoder.cpp.
+ (WebKit::KeyedDecoder::KeyedDecoder):
+ (WebKit::KeyedDecoder::~KeyedDecoder):
+ (WebKit::KeyedDecoder::dictionaryFromGVariant):
+ (WebKit::KeyedDecoder::decodeBytes):
+ (WebKit::KeyedDecoder::decodeSimpleValue):
+ (WebKit::KeyedDecoder::decodeBool):
+ (WebKit::KeyedDecoder::decodeUInt32):
+ (WebKit::KeyedDecoder::decodeInt32):
+ (WebKit::KeyedDecoder::decodeInt64):
+ (WebKit::KeyedDecoder::decodeFloat):
+ (WebKit::KeyedDecoder::decodeDouble):
+ (WebKit::KeyedDecoder::decodeString):
+ (WebKit::KeyedDecoder::beginObject):
+ (WebKit::KeyedDecoder::endObject):
+ (WebKit::KeyedDecoder::beginArray):
+ (WebKit::KeyedDecoder::beginArrayElement):
+ (WebKit::KeyedDecoder::endArrayElement):
+ (WebKit::KeyedDecoder::endArray):
+ * Shared/glib/KeyedDecoder.h: Renamed from Source/WebKit2/Shared/gtk/KeyedDecoder.h.
+ * Shared/glib/KeyedEncoder.cpp: Renamed from Source/WebKit2/Shared/gtk/KeyedEncoder.cpp.
+ (WebKit::KeyedEncoder::KeyedEncoder):
+ (WebKit::KeyedEncoder::~KeyedEncoder):
+ (WebKit::KeyedEncoder::encodeBytes):
+ (WebKit::KeyedEncoder::encodeBool):
+ (WebKit::KeyedEncoder::encodeUInt32):
+ (WebKit::KeyedEncoder::encodeInt32):
+ (WebKit::KeyedEncoder::encodeInt64):
+ (WebKit::KeyedEncoder::encodeFloat):
+ (WebKit::KeyedEncoder::encodeDouble):
+ (WebKit::KeyedEncoder::encodeString):
+ (WebKit::KeyedEncoder::beginObject):
+ (WebKit::KeyedEncoder::endObject):
+ (WebKit::KeyedEncoder::beginArray):
+ (WebKit::KeyedEncoder::beginArrayElement):
+ (WebKit::KeyedEncoder::endArrayElement):
+ (WebKit::KeyedEncoder::endArray):
+ (WebKit::KeyedEncoder::finishEncoding):
+ * Shared/glib/KeyedEncoder.h: Renamed from Source/WebKit2/Shared/gtk/KeyedEncoder.h.
+ * UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
+ (WebKit::DatabaseProcessProxy::platformGetLaunchOptions):
+
</ins><span class="cx"> 2015-07-22 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Seccomp] Canonicalize filesystem path when whitelisting it
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessEntryPointunixDatabaseProcessMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp (187190 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp 2015-07-22 22:09:35 UTC (rev 187190)
+++ trunk/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include "config.h"
</ins><span class="cx"> #include "DatabaseProcessMainUnix.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcesseflDatabaseProcessMainEflcppfromrev187190trunkSourceWebKit2DatabaseProcessEntryPointunixDatabaseProcessMaincpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp (from rev 187190, trunk/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp) (0 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+/*
+ * 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 "DatabaseProcess.h"
+
+#if ENABLE(DATABASE_PROCESS)
+
+#include "ChildProcessMain.h"
+#include "DatabaseProcessMainUnix.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+class DatabaseProcessMain final: public ChildProcessMainBase {
+public:
+ bool platformInitialize() override
+ {
+ return true;
+ }
+};
+
+int DatabaseProcessMainUnix(int argc, char** argv)
+{
+ return ChildProcessMain<DatabaseProcess, DatabaseProcessMain>(argc, argv);
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(DATABASE_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (187190 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-07-22 22:09:35 UTC (rev 187190)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -1,4 +1,6 @@
</span><span class="cx"> list(APPEND WebKit2_SOURCES
</span><ins>+ DatabaseProcess/efl/DatabaseProcessMainEfl.cpp
+
</ins><span class="cx"> NetworkProcess/efl/NetworkProcessMainEfl.cpp
</span><span class="cx">
</span><span class="cx"> NetworkProcess/soup/NetworkProcessSoup.cpp
</span><span class="lines">@@ -45,6 +47,9 @@
</span><span class="cx"> Shared/efl/ProcessExecutablePathEfl.cpp
</span><span class="cx"> Shared/efl/WebEventFactory.cpp
</span><span class="cx">
</span><ins>+ Shared/glib/KeyedDecoder.cpp
+ Shared/glib/KeyedEncoder.cpp
+
</ins><span class="cx"> Shared/linux/WebMemorySamplerLinux.cpp
</span><span class="cx">
</span><span class="cx"> Shared/linux/SeccompFilters/OpenSyscall.cpp
</span><span class="lines">@@ -124,6 +129,8 @@
</span><span class="cx"> UIProcess/CoordinatedGraphics/WebView.cpp
</span><span class="cx"> UIProcess/CoordinatedGraphics/WebViewClient.cpp
</span><span class="cx">
</span><ins>+ UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp
+
</ins><span class="cx"> UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
</span><span class="lines">@@ -231,6 +238,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/x11"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/soup"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/enchant"
</span><ins>+ "${WEBKIT2_DIR}/DatabaseProcess/unix"
</ins><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/efl"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/unix"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/efl"
</span><span class="lines">@@ -261,6 +269,8 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
</span><span class="cx"> "${WTF_DIR}/wtf/efl"
</span><span class="cx"> "${WTF_DIR}/wtf/glib"
</span><ins>+ "${WTF_DIR}"
+ "${WEBKIT2_DIR}"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="lines">@@ -317,6 +327,10 @@
</span><span class="cx"> NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND DatabaseProcess_SOURCES
+ DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
+)
+
</ins><span class="cx"> list(APPEND WebProcess_LIBRARIES
</span><span class="cx"> ${CAIRO_LIBRARIES}
</span><span class="cx"> ${ECORE_IMF_EVAS_LIBRARIES}
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (187190 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-07-22 22:09:35 UTC (rev 187190)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx">
</span><span class="cx"> Shared/cairo/ShareableBitmapCairo.cpp
</span><span class="cx">
</span><ins>+ Shared/glib/KeyedDecoder.cpp
+ Shared/glib/KeyedEncoder.cpp
</ins><span class="cx"> Shared/gtk/ArgumentCodersGtk.cpp
</span><del>- Shared/gtk/KeyedDecoder.cpp
- Shared/gtk/KeyedEncoder.cpp
</del><span class="cx"> Shared/gtk/NativeContextMenuItemGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebKeyboardEventGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebMouseEventGtk.cpp
</span><span class="lines">@@ -483,6 +483,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Network/CustomProtocols/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Downloads/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/unix"
</span><ins>+ "${WEBKIT2_DIR}/Shared/glib"
</ins><span class="cx"> "${WEBKIT2_DIR}/Shared/gtk"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/linux"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/linux/SeccompFilters"
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedglibKeyedDecodercppfromrev187190trunkSourceWebKit2SharedgtkKeyedDecodercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/glib/KeyedDecoder.cpp (from rev 187190, trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.cpp) (0 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/glib/KeyedDecoder.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/glib/KeyedDecoder.cpp 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -0,0 +1,168 @@
</span><ins>+/*
+ * 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 "KeyedDecoder.h"
+
+#include <wtf/text/CString.h>
+
+namespace WebKit {
+
+KeyedDecoder::KeyedDecoder(const uint8_t* data, size_t size)
+{
+ GRefPtr<GBytes> bytes = adoptGRef(g_bytes_new(data, size));
+ GRefPtr<GVariant> variant = g_variant_new_from_bytes(G_VARIANT_TYPE("a{sv}"), bytes.get(), TRUE);
+ m_dictionaryStack.append(dictionaryFromGVariant(variant.get()));
+}
+
+KeyedDecoder::~KeyedDecoder()
+{
+ ASSERT(m_dictionaryStack.size() == 1);
+ ASSERT(m_arrayStack.isEmpty());
+ ASSERT(m_arrayIndexStack.isEmpty());
+}
+
+HashMap<String, GRefPtr<GVariant>> KeyedDecoder::dictionaryFromGVariant(GVariant* variant)
+{
+ HashMap<String, GRefPtr<GVariant>> dictionary;
+ GVariantIter iter;
+ g_variant_iter_init(&iter, variant);
+ const char* key;
+ GVariant* value;
+ while (g_variant_iter_loop(&iter, "{&sv}", &key, &value))
+ dictionary.set(String::fromUTF8(key), value);
+ return WTF::move(dictionary);
+}
+
+bool KeyedDecoder::decodeBytes(const String& key, const uint8_t*& bytes, size_t& size)
+{
+ GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
+ if (!value)
+ return false;
+
+ size = g_variant_get_size(value.get());
+ bytes = static_cast<const uint8_t*>(g_variant_get_data(value.get()));
+ return true;
+}
+
+template<typename T, typename F>
+bool KeyedDecoder::decodeSimpleValue(const String& key, T& result, F getFunction)
+{
+ GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
+ if (!value)
+ return false;
+
+ result = getFunction(value.get());
+ return true;
+}
+
+bool KeyedDecoder::decodeBool(const String& key, bool& result)
+{
+ return decodeSimpleValue(key, result, g_variant_get_boolean);
+}
+
+bool KeyedDecoder::decodeUInt32(const String& key, uint32_t& result)
+{
+ return decodeSimpleValue(key, result, g_variant_get_uint32);
+}
+
+bool KeyedDecoder::decodeInt32(const String& key, int32_t& result)
+{
+ return decodeSimpleValue(key, result, g_variant_get_int32);
+}
+
+bool KeyedDecoder::decodeInt64(const String& key, int64_t& result)
+{
+ return decodeSimpleValue(key, result, g_variant_get_int64);
+}
+
+bool KeyedDecoder::decodeFloat(const String& key, float& result)
+{
+ return decodeSimpleValue(key, result, g_variant_get_double);
+}
+
+bool KeyedDecoder::decodeDouble(const String& key, double& result)
+{
+ return decodeSimpleValue(key, result, g_variant_get_double);
+}
+
+bool KeyedDecoder::decodeString(const String& key, String& result)
+{
+ GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
+ if (!value)
+ return false;
+
+ result = String::fromUTF8(g_variant_get_string(value.get(), nullptr));
+ return true;
+}
+
+bool KeyedDecoder::beginObject(const String& key)
+{
+ GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
+ if (!value)
+ return false;
+
+ m_dictionaryStack.append(dictionaryFromGVariant(value.get()));
+ return true;
+}
+
+void KeyedDecoder::endObject()
+{
+ m_dictionaryStack.removeLast();
+}
+
+bool KeyedDecoder::beginArray(const String& key)
+{
+ GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
+ if (!value)
+ return false;
+
+ m_arrayStack.append(value.get());
+ m_arrayIndexStack.append(0);
+ return true;
+}
+
+bool KeyedDecoder::beginArrayElement()
+{
+ if (m_arrayIndexStack.last() >= g_variant_n_children(m_arrayStack.last()))
+ return false;
+
+ GRefPtr<GVariant> variant = adoptGRef(g_variant_get_child_value(m_arrayStack.last(), m_arrayIndexStack.last()++));
+ m_dictionaryStack.append(dictionaryFromGVariant(variant.get()));
+ return true;
+}
+
+void KeyedDecoder::endArrayElement()
+{
+ m_dictionaryStack.removeLast();
+}
+
+void KeyedDecoder::endArray()
+{
+ m_arrayStack.removeLast();
+ m_arrayIndexStack.removeLast();
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedglibKeyedDecoderhfromrev187190trunkSourceWebKit2SharedgtkKeyedDecoderh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/glib/KeyedDecoder.h (from rev 187190, trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h) (0 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/glib/KeyedDecoder.h (rev 0)
+++ trunk/Source/WebKit2/Shared/glib/KeyedDecoder.h 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+/*
+ * Copyright (C) 2015 Igaia 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.
+ */
+
+#ifndef KeyedDecoder_h
+#define KeyedDecoder_h
+
+#include <WebCore/KeyedCoding.h>
+#include <glib.h>
+#include <wtf/HashMap.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/text/StringHash.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+class KeyedDecoder final : public WebCore::KeyedDecoder {
+public:
+ KeyedDecoder(const uint8_t* data, size_t);
+ virtual ~KeyedDecoder() override;
+
+private:
+ virtual bool decodeBytes(const String& key, const uint8_t*&, size_t&) override;
+ virtual bool decodeBool(const String& key, bool&) override;
+ virtual bool decodeUInt32(const String& key, uint32_t&) override;
+ virtual bool decodeInt32(const String& key, int32_t&) override;
+ virtual bool decodeInt64(const String& key, int64_t&) override;
+ virtual bool decodeFloat(const String& key, float&) override;
+ virtual bool decodeDouble(const String& key, double&) override;
+ virtual bool decodeString(const String& key, String&) override;
+
+ virtual bool beginObject(const String& key) override;
+ virtual void endObject() override;
+
+ virtual bool beginArray(const String& key) override;
+ virtual bool beginArrayElement() override;
+ virtual void endArrayElement() override;
+ virtual void endArray() override;
+
+ template<typename T, typename F> bool decodeSimpleValue(const String& key, T& result, F getFunction);
+ HashMap<String, GRefPtr<GVariant>> dictionaryFromGVariant(GVariant*);
+
+ Vector<HashMap<String, GRefPtr<GVariant>>> m_dictionaryStack;
+ Vector<GVariant*, 16> m_arrayStack;
+ Vector<unsigned> m_arrayIndexStack;
+};
+
+} // namespace WebKit
+
+#endif // KeyedDecoder_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedglibKeyedEncodercppfromrev187190trunkSourceWebKit2SharedgtkKeyedEncodercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/glib/KeyedEncoder.cpp (from rev 187190, trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.cpp) (0 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/glib/KeyedEncoder.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/glib/KeyedEncoder.cpp 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -0,0 +1,135 @@
</span><ins>+/*
+ * 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 "KeyedEncoder.h"
+
+#include <WebCore/SharedBuffer.h>
+#include <wtf/text/CString.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+KeyedEncoder::KeyedEncoder()
+{
+ g_variant_builder_init(&m_variantBuilder, G_VARIANT_TYPE("a{sv}"));
+ m_variantBuilderStack.append(&m_variantBuilder);
+}
+
+KeyedEncoder::~KeyedEncoder()
+{
+ ASSERT(m_variantBuilderStack.size() == 1);
+ ASSERT(m_variantBuilderStack.last() == &m_variantBuilder);
+ ASSERT(m_arrayStack.isEmpty());
+ ASSERT(m_objectStack.isEmpty());
+}
+
+void KeyedEncoder::encodeBytes(const String& key, const uint8_t* bytes, size_t size)
+{
+ GRefPtr<GBytes> gBytes = adoptGRef(g_bytes_new_static(bytes, size));
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_from_bytes(G_VARIANT_TYPE("ay"), gBytes.get(), TRUE));
+}
+
+void KeyedEncoder::encodeBool(const String& key, bool value)
+{
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_boolean(value));
+}
+
+void KeyedEncoder::encodeUInt32(const String& key, uint32_t value)
+{
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_uint32(value));
+}
+
+void KeyedEncoder::encodeInt32(const String& key, int32_t value)
+{
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_int32(value));
+}
+
+void KeyedEncoder::encodeInt64(const String& key, int64_t value)
+{
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_int64(value));
+}
+
+void KeyedEncoder::encodeFloat(const String& key, float value)
+{
+ encodeDouble(key, value);
+}
+
+void KeyedEncoder::encodeDouble(const String& key, double value)
+{
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_double(value));
+}
+
+void KeyedEncoder::encodeString(const String& key, const String& value)
+{
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_string(value.utf8().data()));
+}
+
+void KeyedEncoder::beginObject(const String& key)
+{
+ GRefPtr<GVariantBuilder> builder = adoptGRef(g_variant_builder_new(G_VARIANT_TYPE("aa{sv}")));
+ m_objectStack.append(std::make_pair(key, builder));
+ m_variantBuilderStack.append(builder.get());
+}
+
+void KeyedEncoder::endObject()
+{
+ GVariantBuilder* builder = m_variantBuilderStack.takeLast();
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", m_objectStack.last().first.utf8().data(), g_variant_builder_end(builder));
+ m_objectStack.removeLast();
+}
+
+void KeyedEncoder::beginArray(const String& key)
+{
+ m_arrayStack.append(std::make_pair(key, adoptGRef(g_variant_builder_new(G_VARIANT_TYPE("aa{sv}")))));
+}
+
+void KeyedEncoder::beginArrayElement()
+{
+ m_variantBuilderStack.append(g_variant_builder_new(G_VARIANT_TYPE("a{sv}")));
+}
+
+void KeyedEncoder::endArrayElement()
+{
+ GRefPtr<GVariantBuilder> variantBuilder = adoptGRef(m_variantBuilderStack.takeLast());
+ g_variant_builder_add_value(m_arrayStack.last().second.get(), g_variant_builder_end(variantBuilder.get()));
+}
+
+void KeyedEncoder::endArray()
+{
+ g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", m_arrayStack.last().first.utf8().data(), g_variant_builder_end(m_arrayStack.last().second.get()));
+ m_arrayStack.removeLast();
+}
+
+PassRefPtr<SharedBuffer> KeyedEncoder::finishEncoding()
+{
+ g_assert(m_variantBuilderStack.last() == &m_variantBuilder);
+ GRefPtr<GVariant> variant = g_variant_builder_end(&m_variantBuilder);
+ GRefPtr<GBytes> data = g_variant_get_data_as_bytes(variant.get());
+ return SharedBuffer::create(static_cast<const unsigned char*>(g_bytes_get_data(data.get(), nullptr)), static_cast<unsigned>(g_bytes_get_size(data.get())));
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedglibKeyedEncoderhfromrev187190trunkSourceWebKit2SharedgtkKeyedEncoderh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/glib/KeyedEncoder.h (from rev 187190, trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h) (0 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/glib/KeyedEncoder.h (rev 0)
+++ trunk/Source/WebKit2/Shared/glib/KeyedEncoder.h 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+/*
+ * 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.
+ */
+
+#ifndef KeyedEncoder_h
+#define KeyedEncoder_h
+
+#include <WebCore/KeyedCoding.h>
+#include <glib.h>
+#include <wtf/Vector.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+class KeyedEncoder final : public WebCore::KeyedEncoder {
+public:
+ KeyedEncoder();
+ ~KeyedEncoder();
+
+ virtual PassRefPtr<WebCore::SharedBuffer> finishEncoding() override;
+
+private:
+ virtual void encodeBytes(const String& key, const uint8_t*, size_t) override;
+ virtual void encodeBool(const String& key, bool) override;
+ virtual void encodeUInt32(const String& key, uint32_t) override;
+ virtual void encodeInt32(const String& key, int32_t) override;
+ virtual void encodeInt64(const String& key, int64_t) override;
+ virtual void encodeFloat(const String& key, float) override;
+ virtual void encodeDouble(const String& key, double) override;
+ virtual void encodeString(const String& key, const String&) override;
+
+ virtual void beginObject(const String& key) override;
+ virtual void endObject() override;
+
+ virtual void beginArray(const String& key) override;
+ virtual void beginArrayElement() override;
+ virtual void endArrayElement() override;
+ virtual void endArray() override;
+
+ GVariantBuilder m_variantBuilder;
+ Vector<GVariantBuilder*, 16> m_variantBuilderStack;
+ Vector<std::pair<String, GRefPtr<GVariantBuilder>>, 16> m_arrayStack;
+ Vector<std::pair<String, GRefPtr<GVariantBuilder>>, 16> m_objectStack;
+};
+
+} // namespace WebKit
+
+#endif // KeyedEncoder_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkKeyedDecodercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.cpp (187190 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.cpp 2015-07-22 22:09:35 UTC (rev 187190)
+++ trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.cpp 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -1,168 +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 "KeyedDecoder.h"
-
-#include <wtf/text/CString.h>
-
-namespace WebKit {
-
-KeyedDecoder::KeyedDecoder(const uint8_t* data, size_t size)
-{
- GRefPtr<GBytes> bytes = adoptGRef(g_bytes_new(data, size));
- GRefPtr<GVariant> variant = g_variant_new_from_bytes(G_VARIANT_TYPE("a{sv}"), bytes.get(), TRUE);
- m_dictionaryStack.append(dictionaryFromGVariant(variant.get()));
-}
-
-KeyedDecoder::~KeyedDecoder()
-{
- ASSERT(m_dictionaryStack.size() == 1);
- ASSERT(m_arrayStack.isEmpty());
- ASSERT(m_arrayIndexStack.isEmpty());
-}
-
-HashMap<String, GRefPtr<GVariant>> KeyedDecoder::dictionaryFromGVariant(GVariant* variant)
-{
- HashMap<String, GRefPtr<GVariant>> dictionary;
- GVariantIter iter;
- g_variant_iter_init(&iter, variant);
- const char* key;
- GVariant* value;
- while (g_variant_iter_loop(&iter, "{&sv}", &key, &value))
- dictionary.set(String::fromUTF8(key), value);
- return WTF::move(dictionary);
-}
-
-bool KeyedDecoder::decodeBytes(const String& key, const uint8_t*& bytes, size_t& size)
-{
- GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
- if (!value)
- return false;
-
- size = g_variant_get_size(value.get());
- bytes = static_cast<const uint8_t*>(g_variant_get_data(value.get()));
- return true;
-}
-
-template<typename T, typename F>
-bool KeyedDecoder::decodeSimpleValue(const String& key, T& result, F getFunction)
-{
- GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
- if (!value)
- return false;
-
- result = getFunction(value.get());
- return true;
-}
-
-bool KeyedDecoder::decodeBool(const String& key, bool& result)
-{
- return decodeSimpleValue(key, result, g_variant_get_boolean);
-}
-
-bool KeyedDecoder::decodeUInt32(const String& key, uint32_t& result)
-{
- return decodeSimpleValue(key, result, g_variant_get_uint32);
-}
-
-bool KeyedDecoder::decodeInt32(const String& key, int32_t& result)
-{
- return decodeSimpleValue(key, result, g_variant_get_int32);
-}
-
-bool KeyedDecoder::decodeInt64(const String& key, int64_t& result)
-{
- return decodeSimpleValue(key, result, g_variant_get_int64);
-}
-
-bool KeyedDecoder::decodeFloat(const String& key, float& result)
-{
- return decodeSimpleValue(key, result, g_variant_get_double);
-}
-
-bool KeyedDecoder::decodeDouble(const String& key, double& result)
-{
- return decodeSimpleValue(key, result, g_variant_get_double);
-}
-
-bool KeyedDecoder::decodeString(const String& key, String& result)
-{
- GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
- if (!value)
- return false;
-
- result = String::fromUTF8(g_variant_get_string(value.get(), nullptr));
- return true;
-}
-
-bool KeyedDecoder::beginObject(const String& key)
-{
- GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
- if (!value)
- return false;
-
- m_dictionaryStack.append(dictionaryFromGVariant(value.get()));
- return true;
-}
-
-void KeyedDecoder::endObject()
-{
- m_dictionaryStack.removeLast();
-}
-
-bool KeyedDecoder::beginArray(const String& key)
-{
- GRefPtr<GVariant> value = m_dictionaryStack.last().get(key);
- if (!value)
- return false;
-
- m_arrayStack.append(value.get());
- m_arrayIndexStack.append(0);
- return true;
-}
-
-bool KeyedDecoder::beginArrayElement()
-{
- if (m_arrayIndexStack.last() >= g_variant_n_children(m_arrayStack.last()))
- return false;
-
- GRefPtr<GVariant> variant = adoptGRef(g_variant_get_child_value(m_arrayStack.last(), m_arrayIndexStack.last()++));
- m_dictionaryStack.append(dictionaryFromGVariant(variant.get()));
- return true;
-}
-
-void KeyedDecoder::endArrayElement()
-{
- m_dictionaryStack.removeLast();
-}
-
-void KeyedDecoder::endArray()
-{
- m_arrayStack.removeLast();
- m_arrayIndexStack.removeLast();
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkKeyedDecoderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h (187190 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h 2015-07-22 22:09:35 UTC (rev 187190)
+++ trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Igaia 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.
- */
-
-#ifndef KeyedDecoder_h
-#define KeyedDecoder_h
-
-#include <WebCore/KeyedCoding.h>
-#include <glib.h>
-#include <wtf/HashMap.h>
-#include <wtf/glib/GRefPtr.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-class KeyedDecoder final : public WebCore::KeyedDecoder {
-public:
- KeyedDecoder(const uint8_t* data, size_t);
- virtual ~KeyedDecoder() override;
-
-private:
- virtual bool decodeBytes(const String& key, const uint8_t*&, size_t&) override;
- virtual bool decodeBool(const String& key, bool&) override;
- virtual bool decodeUInt32(const String& key, uint32_t&) override;
- virtual bool decodeInt32(const String& key, int32_t&) override;
- virtual bool decodeInt64(const String& key, int64_t&) override;
- virtual bool decodeFloat(const String& key, float&) override;
- virtual bool decodeDouble(const String& key, double&) override;
- virtual bool decodeString(const String& key, String&) override;
-
- virtual bool beginObject(const String& key) override;
- virtual void endObject() override;
-
- virtual bool beginArray(const String& key) override;
- virtual bool beginArrayElement() override;
- virtual void endArrayElement() override;
- virtual void endArray() override;
-
- template<typename T, typename F> bool decodeSimpleValue(const String& key, T& result, F getFunction);
- HashMap<String, GRefPtr<GVariant>> dictionaryFromGVariant(GVariant*);
-
- Vector<HashMap<String, GRefPtr<GVariant>>> m_dictionaryStack;
- Vector<GVariant*, 16> m_arrayStack;
- Vector<unsigned> m_arrayIndexStack;
-};
-
-} // namespace WebKit
-
-#endif // KeyedDecoder_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkKeyedEncodercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.cpp (187190 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.cpp 2015-07-22 22:09:35 UTC (rev 187190)
+++ trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.cpp 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -1,135 +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 "KeyedEncoder.h"
-
-#include <WebCore/SharedBuffer.h>
-#include <wtf/text/CString.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-KeyedEncoder::KeyedEncoder()
-{
- g_variant_builder_init(&m_variantBuilder, G_VARIANT_TYPE("a{sv}"));
- m_variantBuilderStack.append(&m_variantBuilder);
-}
-
-KeyedEncoder::~KeyedEncoder()
-{
- ASSERT(m_variantBuilderStack.size() == 1);
- ASSERT(m_variantBuilderStack.last() == &m_variantBuilder);
- ASSERT(m_arrayStack.isEmpty());
- ASSERT(m_objectStack.isEmpty());
-}
-
-void KeyedEncoder::encodeBytes(const String& key, const uint8_t* bytes, size_t size)
-{
- GRefPtr<GBytes> gBytes = adoptGRef(g_bytes_new_static(bytes, size));
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_from_bytes(G_VARIANT_TYPE("ay"), gBytes.get(), TRUE));
-}
-
-void KeyedEncoder::encodeBool(const String& key, bool value)
-{
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_boolean(value));
-}
-
-void KeyedEncoder::encodeUInt32(const String& key, uint32_t value)
-{
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_uint32(value));
-}
-
-void KeyedEncoder::encodeInt32(const String& key, int32_t value)
-{
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_int32(value));
-}
-
-void KeyedEncoder::encodeInt64(const String& key, int64_t value)
-{
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_int64(value));
-}
-
-void KeyedEncoder::encodeFloat(const String& key, float value)
-{
- encodeDouble(key, value);
-}
-
-void KeyedEncoder::encodeDouble(const String& key, double value)
-{
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_double(value));
-}
-
-void KeyedEncoder::encodeString(const String& key, const String& value)
-{
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", key.utf8().data(), g_variant_new_string(value.utf8().data()));
-}
-
-void KeyedEncoder::beginObject(const String& key)
-{
- GRefPtr<GVariantBuilder> builder = adoptGRef(g_variant_builder_new(G_VARIANT_TYPE("aa{sv}")));
- m_objectStack.append(std::make_pair(key, builder));
- m_variantBuilderStack.append(builder.get());
-}
-
-void KeyedEncoder::endObject()
-{
- GVariantBuilder* builder = m_variantBuilderStack.takeLast();
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", m_objectStack.last().first.utf8().data(), g_variant_builder_end(builder));
- m_objectStack.removeLast();
-}
-
-void KeyedEncoder::beginArray(const String& key)
-{
- m_arrayStack.append(std::make_pair(key, adoptGRef(g_variant_builder_new(G_VARIANT_TYPE("aa{sv}")))));
-}
-
-void KeyedEncoder::beginArrayElement()
-{
- m_variantBuilderStack.append(g_variant_builder_new(G_VARIANT_TYPE("a{sv}")));
-}
-
-void KeyedEncoder::endArrayElement()
-{
- GRefPtr<GVariantBuilder> variantBuilder = adoptGRef(m_variantBuilderStack.takeLast());
- g_variant_builder_add_value(m_arrayStack.last().second.get(), g_variant_builder_end(variantBuilder.get()));
-}
-
-void KeyedEncoder::endArray()
-{
- g_variant_builder_add(m_variantBuilderStack.last(), "{sv}", m_arrayStack.last().first.utf8().data(), g_variant_builder_end(m_arrayStack.last().second.get()));
- m_arrayStack.removeLast();
-}
-
-PassRefPtr<SharedBuffer> KeyedEncoder::finishEncoding()
-{
- g_assert(m_variantBuilderStack.last() == &m_variantBuilder);
- GRefPtr<GVariant> variant = g_variant_builder_end(&m_variantBuilder);
- GRefPtr<GBytes> data = g_variant_get_data_as_bytes(variant.get());
- return SharedBuffer::create(static_cast<const unsigned char*>(g_bytes_get_data(data.get(), nullptr)), static_cast<unsigned>(g_bytes_get_size(data.get())));
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkKeyedEncoderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h (187190 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h 2015-07-22 22:09:35 UTC (rev 187190)
+++ trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -1,70 +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.
- */
-
-#ifndef KeyedEncoder_h
-#define KeyedEncoder_h
-
-#include <WebCore/KeyedCoding.h>
-#include <glib.h>
-#include <wtf/Vector.h>
-#include <wtf/glib/GRefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-class KeyedEncoder final : public WebCore::KeyedEncoder {
-public:
- KeyedEncoder();
- ~KeyedEncoder();
-
- virtual PassRefPtr<WebCore::SharedBuffer> finishEncoding() override;
-
-private:
- virtual void encodeBytes(const String& key, const uint8_t*, size_t) override;
- virtual void encodeBool(const String& key, bool) override;
- virtual void encodeUInt32(const String& key, uint32_t) override;
- virtual void encodeInt32(const String& key, int32_t) override;
- virtual void encodeInt64(const String& key, int64_t) override;
- virtual void encodeFloat(const String& key, float) override;
- virtual void encodeDouble(const String& key, double) override;
- virtual void encodeString(const String& key, const String&) override;
-
- virtual void beginObject(const String& key) override;
- virtual void endObject() override;
-
- virtual void beginArray(const String& key) override;
- virtual void beginArrayElement() override;
- virtual void endArrayElement() override;
- virtual void endArray() override;
-
- GVariantBuilder m_variantBuilder;
- Vector<GVariantBuilder*, 16> m_variantBuilderStack;
- Vector<std::pair<String, GRefPtr<GVariantBuilder>>, 16> m_arrayStack;
- Vector<std::pair<String, GRefPtr<GVariantBuilder>>, 16> m_objectStack;
-};
-
-} // namespace WebKit
-
-#endif // KeyedEncoder_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDatabaseseflDatabaseProcessProxyEflcppfromrev187190trunkSourceWebKit2DatabaseProcessEntryPointunixDatabaseProcessMaincpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp (from rev 187190, trunk/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp) (0 => 187191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp 2015-07-22 22:51:35 UTC (rev 187191)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * 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)
</ins></span></pre>
</div>
</div>
</body>
</html>