<!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>[189810] trunk/Source</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/189810">189810</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-09-15 09:36:19 -0700 (Tue, 15 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move most IDB object encoding/decoding from WebKit2 to WebCore.
https://bugs.webkit.org/show_bug.cgi?id=149152
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (Cleanup, no behavior change).
* Modules/indexeddb/IDBDatabaseMetadata.h:
(WebCore::IDBDatabaseMetadata::encode):
(WebCore::IDBDatabaseMetadata::decode):
* Modules/indexeddb/IDBIndexMetadata.h:
(WebCore::IDBIndexMetadata::encode):
(WebCore::IDBIndexMetadata::decode):
* Modules/indexeddb/IDBKeyData.h:
(WebCore::IDBKeyData::encode):
(WebCore::IDBKeyData::decode):
* Modules/indexeddb/IDBKeyPath.h:
(WebCore::IDBKeyPath::encode):
(WebCore::IDBKeyPath::decode):
* Modules/indexeddb/IDBKeyRangeData.h:
(WebCore::IDBKeyRangeData::encode):
(WebCore::IDBKeyRangeData::decode):
* Modules/indexeddb/IDBObjectStoreMetadata.h:
(WebCore::IDBObjectStoreMetadata::encode):
(WebCore::IDBObjectStoreMetadata::decode):
Source/WebKit2:
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<IDBDatabaseMetadata>::encode): Deleted.
(IPC::ArgumentCoder<IDBDatabaseMetadata>::decode): Deleted.
(IPC::ArgumentCoder<IDBIndexMetadata>::encode): Deleted.
(IPC::ArgumentCoder<IDBIndexMetadata>::decode): Deleted.
(IPC::ArgumentCoder<IDBKeyData>::encode): Deleted.
(IPC::ArgumentCoder<IDBKeyData>::decode): Deleted.
(IPC::ArgumentCoder<IDBKeyPath>::encode): Deleted.
(IPC::ArgumentCoder<IDBKeyPath>::decode): Deleted.
(IPC::ArgumentCoder<IDBKeyRangeData>::encode): Deleted.
(IPC::ArgumentCoder<IDBKeyRangeData>::decode): Deleted.
(IPC::ArgumentCoder<IDBObjectStoreMetadata>::encode): Deleted.
(IPC::ArgumentCoder<IDBObjectStoreMetadata>::decode): Deleted.
* Shared/WebCoreArgumentCoders.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseMetadatah">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBIndexMetadatah">trunk/Source/WebCore/Modules/indexeddb/IDBIndexMetadata.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatah">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathh">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyRangeDatah">trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStoreMetadatah">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreMetadata.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebCore/ChangeLog 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-09-15 Brady Eidson <beidson@apple.com>
+
+ Move most IDB object encoding/decoding from WebKit2 to WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=149152
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Cleanup, no behavior change).
+
+ * Modules/indexeddb/IDBDatabaseMetadata.h:
+ (WebCore::IDBDatabaseMetadata::encode):
+ (WebCore::IDBDatabaseMetadata::decode):
+ * Modules/indexeddb/IDBIndexMetadata.h:
+ (WebCore::IDBIndexMetadata::encode):
+ (WebCore::IDBIndexMetadata::decode):
+ * Modules/indexeddb/IDBKeyData.h:
+ (WebCore::IDBKeyData::encode):
+ (WebCore::IDBKeyData::decode):
+ * Modules/indexeddb/IDBKeyPath.h:
+ (WebCore::IDBKeyPath::encode):
+ (WebCore::IDBKeyPath::decode):
+ * Modules/indexeddb/IDBKeyRangeData.h:
+ (WebCore::IDBKeyRangeData::encode):
+ (WebCore::IDBKeyRangeData::decode):
+ * Modules/indexeddb/IDBObjectStoreMetadata.h:
+ (WebCore::IDBObjectStoreMetadata::encode):
+ (WebCore::IDBObjectStoreMetadata::decode):
+
</ins><span class="cx"> 2015-09-14 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Make the enum IDBKey::Type into a utility enum class.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseMetadatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -68,6 +68,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBDatabaseMetadata&);
+
</ins><span class="cx"> String name;
</span><span class="cx"> int64_t id;
</span><span class="cx"> uint64_t version;
</span><span class="lines">@@ -79,6 +82,33 @@
</span><span class="cx"> WEBCORE_EXPORT IDBDatabaseMetadata isolatedCopy() const;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void IDBDatabaseMetadata::encode(Encoder& encoder) const
+{
+ encoder << name << id << version << maxObjectStoreId << objectStores;
+}
+
+template<class Decoder>
+bool IDBDatabaseMetadata::decode(Decoder& decoder, IDBDatabaseMetadata& metadata)
+{
+ if (!decoder.decode(metadata.name))
+ return false;
+
+ if (!decoder.decode(metadata.id))
+ return false;
+
+ if (!decoder.decode(metadata.version))
+ return false;
+
+ if (!decoder.decode(metadata.maxObjectStoreId))
+ return false;
+
+ if (!decoder.decode(metadata.objectStores))
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBIndexMetadatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndexMetadata.h (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBIndexMetadata.h 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndexMetadata.h 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -50,6 +50,9 @@
</span><span class="cx"> , multiEntry(multiEntry)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBIndexMetadata&);
</ins><span class="cx">
</span><span class="cx"> String name;
</span><span class="cx"> int64_t id;
</span><span class="lines">@@ -62,6 +65,33 @@
</span><span class="cx"> static const int64_t InvalidId = -1;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void IDBIndexMetadata::encode(Encoder& encoder) const
+{
+ encoder << name << id << keyPath << unique << multiEntry;
+}
+
+template<class Decoder>
+bool IDBIndexMetadata::decode(Decoder& decoder, IDBIndexMetadata& metadata)
+{
+ if (!decoder.decode(metadata.name))
+ return false;
+
+ if (!decoder.decode(metadata.id))
+ return false;
+
+ if (!decoder.decode(metadata.keyPath))
+ return false;
+
+ if (!decoder.decode(metadata.unique))
+ return false;
+
+ if (!decoder.decode(metadata.multiEntry))
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -79,6 +79,9 @@
</span><span class="cx"> void setDateValue(double);
</span><span class="cx"> WEBCORE_EXPORT void setNumberValue(double);
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBKeyData&);
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> WEBCORE_EXPORT String loggingString() const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -90,6 +93,77 @@
</span><span class="cx"> bool isNull;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void IDBKeyData::encode(Encoder& encoder) const
+{
+ encoder << isNull;
+ if (isNull)
+ return;
+
+ encoder.encodeEnum(type);
+
+ switch (type) {
+ case KeyType::Invalid:
+ break;
+ case KeyType::Array:
+ encoder << arrayValue;
+ break;
+ case KeyType::String:
+ encoder << stringValue;
+ break;
+ case KeyType::Date:
+ case KeyType::Number:
+ encoder << numberValue;
+ break;
+ case KeyType::Max:
+ case KeyType::Min:
+ // MaxType and MinType are only used for comparison to other keys.
+ // They should never be encoded/decoded.
+ ASSERT_NOT_REACHED();
+ break;
+ }
+}
+
+template<class Decoder>
+bool IDBKeyData::decode(Decoder& decoder, IDBKeyData& keyData)
+{
+ if (!decoder.decode(keyData.isNull))
+ return false;
+
+ if (keyData.isNull)
+ return true;
+
+ if (!decoder.decodeEnum(keyData.type))
+ return false;
+
+ switch (keyData.type) {
+ case KeyType::Invalid:
+ break;
+ case KeyType::Array:
+ if (!decoder.decode(keyData.arrayValue))
+ return false;
+ break;
+ case KeyType::String:
+ if (!decoder.decode(keyData.stringValue))
+ return false;
+ break;
+ case KeyType::Date:
+ case KeyType::Number:
+ if (!decoder.decode(keyData.numberValue))
+ return false;
+ break;
+ case KeyType::Max:
+ case KeyType::Min:
+ // MaxType and MinType are only used for comparison to other keys.
+ // They should never be encoded/decoded.
+ ASSERT_NOT_REACHED();
+ decoder.markInvalid();
+ return false;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -77,6 +77,9 @@
</span><span class="cx">
</span><span class="cx"> IDBKeyPath isolatedCopy() const;
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBKeyPath&);
+
</ins><span class="cx"> WEBCORE_EXPORT void encode(KeyedEncoder&) const;
</span><span class="cx"> WEBCORE_EXPORT static bool decode(KeyedDecoder&, IDBKeyPath&);
</span><span class="cx">
</span><span class="lines">@@ -86,6 +89,58 @@
</span><span class="cx"> Vector<String> m_array;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void IDBKeyPath::encode(Encoder& encoder) const
+{
+ encoder.encodeEnum(m_type);
+
+ switch (m_type) {
+ case IDBKeyPath::NullType:
+ break;
+ case IDBKeyPath::StringType:
+ encoder << m_string;
+ break;
+ case IDBKeyPath::ArrayType:
+ encoder << m_array;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+}
+
+template<class Decoder>
+bool IDBKeyPath::decode(Decoder& decoder, IDBKeyPath& keyPath)
+{
+ IDBKeyPath::Type type;
+ if (!decoder.decodeEnum(type))
+ return false;
+
+ switch (type) {
+ case IDBKeyPath::NullType:
+ keyPath = IDBKeyPath();
+ return true;
+
+ case IDBKeyPath::StringType: {
+ String string;
+ if (!decoder.decode(string))
+ return false;
+
+ keyPath = IDBKeyPath(string);
+ return true;
+ }
+ case IDBKeyPath::ArrayType: {
+ Vector<String> array;
+ if (!decoder.decode(array))
+ return false;
+
+ keyPath = IDBKeyPath(array);
+ return true;
+ }
+ default:
+ return true;
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyRangeDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -61,6 +61,9 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isExactlyOneKey() const;
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBKeyRangeData&);
+
</ins><span class="cx"> bool isNull;
</span><span class="cx">
</span><span class="cx"> IDBKeyData lowerKey;
</span><span class="lines">@@ -70,6 +73,40 @@
</span><span class="cx"> bool upperOpen;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void IDBKeyRangeData::encode(Encoder& encoder) const
+{
+ encoder << isNull;
+ if (isNull)
+ return;
+
+ encoder << upperKey << lowerKey << upperOpen << lowerOpen;
+}
+
+template<class Decoder>
+bool IDBKeyRangeData::decode(Decoder& decoder, IDBKeyRangeData& keyRange)
+{
+ if (!decoder.decode(keyRange.isNull))
+ return false;
+
+ if (keyRange.isNull)
+ return true;
+
+ if (!decoder.decode(keyRange.upperKey))
+ return false;
+
+ if (!decoder.decode(keyRange.lowerKey))
+ return false;
+
+ if (!decoder.decode(keyRange.upperOpen))
+ return false;
+
+ if (!decoder.decode(keyRange.lowerOpen))
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStoreMetadatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreMetadata.h (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreMetadata.h 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreMetadata.h 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBObjectStoreMetadata&);
+
</ins><span class="cx"> String name;
</span><span class="cx"> int64_t id;
</span><span class="cx"> IDBKeyPath keyPath;
</span><span class="lines">@@ -63,6 +66,36 @@
</span><span class="cx"> IDBObjectStoreMetadata isolatedCopy() const;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void IDBObjectStoreMetadata::encode(Encoder& encoder) const
+{
+ encoder << name << id << keyPath << autoIncrement << maxIndexId << indexes;
+}
+
+template<class Decoder>
+bool IDBObjectStoreMetadata::decode(Decoder& decoder, IDBObjectStoreMetadata& metadata)
+{
+ if (!decoder.decode(metadata.name))
+ return false;
+
+ if (!decoder.decode(metadata.id))
+ return false;
+
+ if (!decoder.decode(metadata.keyPath))
+ return false;
+
+ if (!decoder.decode(metadata.autoIncrement))
+ return false;
+
+ if (!decoder.decode(metadata.maxIndexId))
+ return false;
+
+ if (!decoder.decode(metadata.indexes))
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-09-15 Brady Eidson <beidson@apple.com>
+
+ Move most IDB object encoding/decoding from WebKit2 to WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=149152
+
+ Reviewed by Alex Christensen.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<IDBDatabaseMetadata>::encode): Deleted.
+ (IPC::ArgumentCoder<IDBDatabaseMetadata>::decode): Deleted.
+ (IPC::ArgumentCoder<IDBIndexMetadata>::encode): Deleted.
+ (IPC::ArgumentCoder<IDBIndexMetadata>::decode): Deleted.
+ (IPC::ArgumentCoder<IDBKeyData>::encode): Deleted.
+ (IPC::ArgumentCoder<IDBKeyData>::decode): Deleted.
+ (IPC::ArgumentCoder<IDBKeyPath>::encode): Deleted.
+ (IPC::ArgumentCoder<IDBKeyPath>::decode): Deleted.
+ (IPC::ArgumentCoder<IDBKeyRangeData>::encode): Deleted.
+ (IPC::ArgumentCoder<IDBKeyRangeData>::decode): Deleted.
+ (IPC::ArgumentCoder<IDBObjectStoreMetadata>::encode): Deleted.
+ (IPC::ArgumentCoder<IDBObjectStoreMetadata>::decode): Deleted.
+ * Shared/WebCoreArgumentCoders.h:
+
</ins><span class="cx"> 2015-09-14 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Make the enum IDBKey::Type into a utility enum class.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -43,11 +43,7 @@
</span><span class="cx"> #include <WebCore/FilterOperations.h>
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/GraphicsLayer.h>
</span><del>-#include <WebCore/IDBDatabaseMetadata.h>
</del><span class="cx"> #include <WebCore/IDBGetResult.h>
</span><del>-#include <WebCore/IDBKeyData.h>
-#include <WebCore/IDBKeyPath.h>
-#include <WebCore/IDBKeyRangeData.h>
</del><span class="cx"> #include <WebCore/Image.h>
</span><span class="cx"> #include <WebCore/Length.h>
</span><span class="cx"> #include <WebCore/Path.h>
</span><span class="lines">@@ -1810,56 +1806,7 @@
</span><span class="cx"> #endif // !USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>-void ArgumentCoder<IDBDatabaseMetadata>::encode(ArgumentEncoder& encoder, const IDBDatabaseMetadata& metadata)
-{
- encoder << metadata.name << metadata.id << metadata.version << metadata.maxObjectStoreId << metadata.objectStores;
-}
</del><span class="cx">
</span><del>-bool ArgumentCoder<IDBDatabaseMetadata>::decode(ArgumentDecoder& decoder, IDBDatabaseMetadata& metadata)
-{
- if (!decoder.decode(metadata.name))
- return false;
-
- if (!decoder.decode(metadata.id))
- return false;
-
- if (!decoder.decode(metadata.version))
- return false;
-
- if (!decoder.decode(metadata.maxObjectStoreId))
- return false;
-
- if (!decoder.decode(metadata.objectStores))
- return false;
-
- return true;
-}
-
-void ArgumentCoder<IDBIndexMetadata>::encode(ArgumentEncoder& encoder, const IDBIndexMetadata& metadata)
-{
- encoder << metadata.name << metadata.id << metadata.keyPath << metadata.unique << metadata.multiEntry;
-}
-
-bool ArgumentCoder<IDBIndexMetadata>::decode(ArgumentDecoder& decoder, IDBIndexMetadata& metadata)
-{
- if (!decoder.decode(metadata.name))
- return false;
-
- if (!decoder.decode(metadata.id))
- return false;
-
- if (!decoder.decode(metadata.keyPath))
- return false;
-
- if (!decoder.decode(metadata.unique))
- return false;
-
- if (!decoder.decode(metadata.multiEntry))
- return false;
-
- return true;
-}
-
</del><span class="cx"> void ArgumentCoder<IDBGetResult>::encode(ArgumentEncoder& encoder, const IDBGetResult& result)
</span><span class="cx"> {
</span><span class="cx"> bool nullData = !result.valueBuffer;
</span><span class="lines">@@ -1896,185 +1843,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<IDBKeyData>::encode(ArgumentEncoder& encoder, const IDBKeyData& keyData)
-{
- encoder << keyData.isNull;
- if (keyData.isNull)
- return;
-
- encoder.encodeEnum(keyData.type);
-
- switch (keyData.type) {
- case KeyType::Invalid:
- break;
- case KeyType::Array:
- encoder << keyData.arrayValue;
- break;
- case KeyType::String:
- encoder << keyData.stringValue;
- break;
- case KeyType::Date:
- case KeyType::Number:
- encoder << keyData.numberValue;
- break;
- case KeyType::Max:
- case KeyType::Min:
- // KeyType::Max and KeyType::Min are only used for comparison to other keys.
- // They should never be sent across the wire.
- ASSERT_NOT_REACHED();
- break;
- }
-}
-
-bool ArgumentCoder<IDBKeyData>::decode(ArgumentDecoder& decoder, IDBKeyData& keyData)
-{
- if (!decoder.decode(keyData.isNull))
- return false;
-
- if (keyData.isNull)
- return true;
-
- if (!decoder.decodeEnum(keyData.type))
- return false;
-
- switch (keyData.type) {
- case KeyType::Invalid:
- break;
- case KeyType::Array:
- if (!decoder.decode(keyData.arrayValue))
- return false;
- break;
- case KeyType::String:
- if (!decoder.decode(keyData.stringValue))
- return false;
- break;
- case KeyType::Date:
- case KeyType::Number:
- if (!decoder.decode(keyData.numberValue))
- return false;
- break;
- case KeyType::Max:
- case KeyType::Min:
- // KeyType::Max and KeyType::Min are only used for comparison to other keys.
- // They should never be sent across the wire.
- ASSERT_NOT_REACHED();
- decoder.markInvalid();
- return false;
- }
-
- return true;
-}
-
-void ArgumentCoder<IDBKeyPath>::encode(ArgumentEncoder& encoder, const IDBKeyPath& keyPath)
-{
- encoder.encodeEnum(keyPath.type());
-
- switch (keyPath.type()) {
- case IDBKeyPath::NullType:
- break;
- case IDBKeyPath::StringType:
- encoder << keyPath.string();
- break;
- case IDBKeyPath::ArrayType:
- encoder << keyPath.array();
- break;
- default:
- ASSERT_NOT_REACHED();
- }
-}
-
-bool ArgumentCoder<IDBKeyPath>::decode(ArgumentDecoder& decoder, IDBKeyPath& keyPath)
-{
- IDBKeyPath::Type type;
- if (!decoder.decodeEnum(type))
- return false;
-
- switch (type) {
- case IDBKeyPath::NullType:
- keyPath = IDBKeyPath();
- return true;
-
- case IDBKeyPath::StringType: {
- String string;
- if (!decoder.decode(string))
- return false;
-
- keyPath = IDBKeyPath(string);
- return true;
- }
- case IDBKeyPath::ArrayType: {
- Vector<String> array;
- if (!decoder.decode(array))
- return false;
-
- keyPath = IDBKeyPath(array);
- return true;
- }
- default:
- return false;
- }
-}
-
-void ArgumentCoder<IDBKeyRangeData>::encode(ArgumentEncoder& encoder, const IDBKeyRangeData& keyRange)
-{
- encoder << keyRange.isNull;
- if (keyRange.isNull)
- return;
-
- encoder << keyRange.upperKey << keyRange.lowerKey << keyRange.upperOpen << keyRange.lowerOpen;
-}
-
-bool ArgumentCoder<IDBKeyRangeData>::decode(ArgumentDecoder& decoder, IDBKeyRangeData& keyRange)
-{
- if (!decoder.decode(keyRange.isNull))
- return false;
-
- if (keyRange.isNull)
- return true;
-
- if (!decoder.decode(keyRange.upperKey))
- return false;
-
- if (!decoder.decode(keyRange.lowerKey))
- return false;
-
- if (!decoder.decode(keyRange.upperOpen))
- return false;
-
- if (!decoder.decode(keyRange.lowerOpen))
- return false;
-
- return true;
-}
-
-void ArgumentCoder<IDBObjectStoreMetadata>::encode(ArgumentEncoder& encoder, const IDBObjectStoreMetadata& metadata)
-{
- encoder << metadata.name << metadata.id << metadata.keyPath << metadata.autoIncrement << metadata.maxIndexId << metadata.indexes;
-}
-
-bool ArgumentCoder<IDBObjectStoreMetadata>::decode(ArgumentDecoder& decoder, IDBObjectStoreMetadata& metadata)
-{
- if (!decoder.decode(metadata.name))
- return false;
-
- if (!decoder.decode(metadata.id))
- return false;
-
- if (!decoder.decode(metadata.keyPath))
- return false;
-
- if (!decoder.decode(metadata.autoIncrement))
- return false;
-
- if (!decoder.decode(metadata.maxIndexId))
- return false;
-
- if (!decoder.decode(metadata.indexes))
- return false;
-
- return true;
-}
-
</del><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<SessionID>::encode(ArgumentEncoder& encoder, const SessionID& sessionID)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (189809 => 189810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2015-09-15 15:51:02 UTC (rev 189809)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2015-09-15 16:36:19 UTC (rev 189810)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> class FloatSize;
</span><span class="cx"> class FixedPositionViewportConstraints;
</span><span class="cx"> class HTTPHeaderMap;
</span><del>-class IDBKeyPath;
</del><span class="cx"> class IntPoint;
</span><span class="cx"> class IntRect;
</span><span class="cx"> class IntSize;
</span><span class="lines">@@ -73,14 +72,9 @@
</span><span class="cx"> struct DictationAlternative;
</span><span class="cx"> struct DictionaryPopupInfo;
</span><span class="cx"> struct FileChooserSettings;
</span><del>-struct IDBDatabaseMetadata;
-struct IDBGetResult;
-struct IDBIndexMetadata;
-struct IDBKeyData;
-struct IDBKeyRangeData;
-struct IDBObjectStoreMetadata;
</del><span class="cx"> struct Length;
</span><span class="cx"> struct GrammarDetail;
</span><ins>+struct IDBGetResult;
</ins><span class="cx"> struct MimeClassInfo;
</span><span class="cx"> struct PasteboardImage;
</span><span class="cx"> struct PasteboardWebContent;
</span><span class="lines">@@ -408,41 +402,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>-template<> struct ArgumentCoder<WebCore::IDBDatabaseMetadata> {
- static void encode(ArgumentEncoder&, const WebCore::IDBDatabaseMetadata&);
- static bool decode(ArgumentDecoder&, WebCore::IDBDatabaseMetadata&);
-};
-
</del><span class="cx"> template<> struct ArgumentCoder<WebCore::IDBGetResult> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::IDBGetResult&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::IDBGetResult&);
</span><span class="cx"> };
</span><del>-
-template<> struct ArgumentCoder<WebCore::IDBIndexMetadata> {
- static void encode(ArgumentEncoder&, const WebCore::IDBIndexMetadata&);
- static bool decode(ArgumentDecoder&, WebCore::IDBIndexMetadata&);
-};
-
-template<> struct ArgumentCoder<WebCore::IDBKeyData> {
- static void encode(ArgumentEncoder&, const WebCore::IDBKeyData&);
- static bool decode(ArgumentDecoder&, WebCore::IDBKeyData&);
-};
-
-template<> struct ArgumentCoder<WebCore::IDBKeyPath> {
- static void encode(ArgumentEncoder&, const WebCore::IDBKeyPath&);
- static bool decode(ArgumentDecoder&, WebCore::IDBKeyPath&);
-};
-
-template<> struct ArgumentCoder<WebCore::IDBKeyRangeData> {
- static void encode(ArgumentEncoder&, const WebCore::IDBKeyRangeData&);
- static bool decode(ArgumentDecoder&, WebCore::IDBKeyRangeData&);
-};
-
-template<> struct ArgumentCoder<WebCore::IDBObjectStoreMetadata> {
- static void encode(ArgumentEncoder&, const WebCore::IDBObjectStoreMetadata&);
- static bool decode(ArgumentDecoder&, WebCore::IDBObjectStoreMetadata&);
-};
-
</del><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::SessionID> {
</span></span></pre>
</div>
</div>
</body>
</html>