<!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>[209135] trunk/Source/WebCore</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/209135">209135</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-30 10:03:23 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GLIB] IndexedDB: Switch to use new encoder for IDBKeyData
https://bugs.webkit.org/show_bug.cgi?id=165191
Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2016-11-30
Reviewed by Sergio Villar Senin.
Instead of using KeyedEncoder.
* Modules/indexeddb/server/IDBSerialization.cpp:
(WebCore::isLegacySerializedIDBKeyData): Helper function to check whether the given data were encoded with
KeyedEncoder or not.
(WebCore::serializedTypeForKeyType): Remove #ifdefs for CF and always use the new encoder.
(WebCore::encodeKey): Ditto.
(WebCore::serializeIDBKeyData): Ditto.
(WebCore::decodeKey): Ditto.
(WebCore::deserializeIDBKeyData): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBSerializationcpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209134 => 209135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-30 18:01:36 UTC (rev 209134)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 18:03:23 UTC (rev 209135)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-30 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] IndexedDB: Switch to use new encoder for IDBKeyData
+ https://bugs.webkit.org/show_bug.cgi?id=165191
+
+ Reviewed by Sergio Villar Senin.
+
+ Instead of using KeyedEncoder.
+
+ * Modules/indexeddb/server/IDBSerialization.cpp:
+ (WebCore::isLegacySerializedIDBKeyData): Helper function to check whether the given data were encoded with
+ KeyedEncoder or not.
+ (WebCore::serializedTypeForKeyType): Remove #ifdefs for CF and always use the new encoder.
+ (WebCore::encodeKey): Ditto.
+ (WebCore::serializeIDBKeyData): Ditto.
+ (WebCore::decodeKey): Ditto.
+ (WebCore::deserializeIDBKeyData): Ditto.
+
</ins><span class="cx"> 2016-11-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Null ResourceResponse Preflight requests cause crash
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBSerializationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp (209134 => 209135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp 2016-11-30 18:01:36 UTC (rev 209134)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp 2016-11-30 18:03:23 UTC (rev 209135)
</span><span class="lines">@@ -31,6 +31,11 @@
</span><span class="cx"> #include "IDBKeyPath.h"
</span><span class="cx"> #include "KeyedCoding.h"
</span><span class="cx">
</span><ins>+#if USE(GLIB)
+#include <glib.h>
+#include <wtf/glib/GRefPtr.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> enum class KeyPathType { Null, String, Array };
</span><span class="lines">@@ -94,15 +99,25 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// This is the magic character that begins serialized PropertyLists, and tells us whether
-// the key we're looking at is an old-style key.
</del><ins>+static bool isLegacySerializedIDBKeyData(const uint8_t* data, size_t size)
+{
</ins><span class="cx"> #if USE(CF)
</span><del>-static const uint8_t LegacySerializedKeyVersion = 'b';
</del><ins>+ UNUSED_PARAM(size);
+
+ // This is the magic character that begins serialized PropertyLists, and tells us whether
+ // the key we're looking at is an old-style key.
+ static const uint8_t legacySerializedKeyVersion = 'b';
+ if (data[0] == legacySerializedKeyVersion)
+ return true;
+#elif USE(GLIB)
+ // KeyedEncoderGLib uses a GVariant dictionary, so check if the given data is a valid GVariant dictionary.
+ GRefPtr<GBytes> bytes = adoptGRef(g_bytes_new(data, size));
+ GRefPtr<GVariant> variant = g_variant_new_from_bytes(G_VARIANT_TYPE("a{sv}"), bytes.get(), FALSE);
+ return g_variant_is_normal_form(variant.get());
</ins><span class="cx"> #endif
</span><ins>+ return false;
+}
</ins><span class="cx">
</span><del>-// FIXME: Linux ports uses KeyedEncoderGlib for their IDBKeys.
-// When a Glib maintainer comes along to enable the new serialization they'll need to
-// denote a Glib magic character here.
</del><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> The IDBKeyData serialization format is as follows:
</span><span class="lines">@@ -134,9 +149,6 @@
</span><span class="cx"> [0 bytes]
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// FIXME: If the GLib magic character ends up being 0x00, we should consider changing
-// this 0x00 so we can support Glib keyed encoding, also.
-#if USE(CF)
</del><span class="cx"> static const uint8_t SIDBKeyVersion = 0x00;
</span><span class="cx"> enum class SIDBKeyType : uint8_t {
</span><span class="cx"> Min = 0x00,
</span><span class="lines">@@ -171,7 +183,6 @@
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN) || CPU(NEEDS_ALIGNED_ACCESS)
</span><span class="cx"> template <typename T> static void writeLittleEndian(Vector<char>& buffer, T value)
</span><span class="lines">@@ -210,7 +221,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(CF)
</del><span class="cx"> static void writeDouble(Vector<char>& data, double d)
</span><span class="cx"> {
</span><span class="cx"> writeLittleEndian(data, *reinterpret_cast<uint64_t*>(&d));
</span><span class="lines">@@ -269,25 +279,16 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> serializeIDBKeyData(const IDBKeyData& key)
</span><span class="cx"> {
</span><del>-#if USE(CF)
</del><span class="cx"> Vector<char> data;
</span><span class="cx"> data.append(SIDBKeyVersion);
</span><span class="cx">
</span><span class="cx"> encodeKey(data, key);
</span><span class="cx"> return SharedBuffer::adoptVector(data);
</span><del>-#else
- auto encoder = KeyedEncoder::encoder();
- key.encode(*encoder);
- return encoder->finishEncoding();
-#endif
-
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(CF)
</del><span class="cx"> static bool decodeKey(const uint8_t*& data, const uint8_t* end, IDBKeyData& result)
</span><span class="cx"> {
</span><span class="cx"> if (!data || data >= end)
</span><span class="lines">@@ -388,7 +389,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool deserializeIDBKeyData(const uint8_t* data, size_t size, IDBKeyData& result)
</span><span class="cx"> {
</span><span class="lines">@@ -395,8 +395,7 @@
</span><span class="cx"> if (!data || !size)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if USE(CF)
- if (data[0] == LegacySerializedKeyVersion) {
</del><ins>+ if (isLegacySerializedIDBKeyData(data, size)) {
</ins><span class="cx"> auto decoder = KeyedDecoder::decoder(data, size);
</span><span class="cx"> return IDBKeyData::decode(*decoder, result);
</span><span class="cx"> }
</span><span class="lines">@@ -414,10 +413,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><del>-#else
- auto decoder = KeyedDecoder::decoder(data, size);
- return IDBKeyData::decode(*decoder, result);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>