<!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>[196786] 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/196786">196786</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-18 16:42:01 -0800 (Thu, 18 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Fix IDBGetResult encoder/decoder.
https://bugs.webkit.org/show_bug.cgi?id=154421
Reviewed by Alex Christensen.
No new tests, as Modern IDB is still disabled for WK2.
But if you manually enable it, "Basic IndexedDB Seems To Work"
Source/WebCore:
* Modules/indexeddb/IDBGetResult.h:
(WebCore::IDBGetResult::encode):
(WebCore::IDBGetResult::decode):
Source/WebKit2:
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<IDBGetResult>::encode): Deleted.
(IPC::ArgumentCoder<IDBGetResult>::decode): Deleted.
* Shared/WebCoreArgumentCoders.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBGetResulth">trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.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 (196785 => 196786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-19 00:27:15 UTC (rev 196785)
+++ trunk/Source/WebCore/ChangeLog 2016-02-19 00:42:01 UTC (rev 196786)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Fix IDBGetResult encoder/decoder.
+ https://bugs.webkit.org/show_bug.cgi?id=154421
+
+ Reviewed by Alex Christensen.
+
+ No new tests, as Modern IDB is still disabled for WK2.
+
+ But if you manually enable it, "Basic IndexedDB Seems To Work"
+
+ * Modules/indexeddb/IDBGetResult.h:
+ (WebCore::IDBGetResult::encode):
+ (WebCore::IDBGetResult::decode):
+
</ins><span class="cx"> 2016-02-18 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Addressing post-review comments after r196747.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBGetResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.h (196785 => 196786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.h 2016-02-19 00:27:15 UTC (rev 196785)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.h 2016-02-19 00:42:01 UTC (rev 196786)
</span><span class="lines">@@ -93,6 +93,9 @@
</span><span class="cx"> const IDBKeyPath& keyPath() const { return m_keyPath; }
</span><span class="cx"> bool isDefined() const { return m_isDefined; }
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBGetResult&);
+
</ins><span class="cx"> // FIXME: When removing LegacyIDB, remove these setters.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=150854
</span><span class="cx">
</span><span class="lines">@@ -111,6 +114,45 @@
</span><span class="cx"> bool m_isDefined { true };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void IDBGetResult::encode(Encoder& encoder) const
+{
+ encoder << m_keyData << m_primaryKeyData << m_keyPath << m_isDefined;
+
+ encoder << !!m_valueBuffer.data();
+ if (m_valueBuffer.data())
+ encoder << *m_valueBuffer.data();
+}
+
+template<class Decoder>
+bool IDBGetResult::decode(Decoder& decoder, IDBGetResult& result)
+{
+ if (!decoder.decode(result.m_keyData))
+ return false;
+
+ if (!decoder.decode(result.m_primaryKeyData))
+ return false;
+
+ if (!decoder.decode(result.m_keyPath))
+ return false;
+
+ if (!decoder.decode(result.m_isDefined))
+ return false;
+
+ bool hasObject;
+ if (!decoder.decode(hasObject))
+ return false;
+
+ if (hasObject) {
+ Vector<uint8_t> value;
+ if (!decoder.decode(value))
+ return false;
+ result.m_valueBuffer = ThreadSafeDataBuffer::adoptVector(value);
+ }
+
+ 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 (196785 => 196786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-19 00:27:15 UTC (rev 196785)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-19 00:42:01 UTC (rev 196786)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-02-18 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: Fix IDBGetResult encoder/decoder.
+ https://bugs.webkit.org/show_bug.cgi?id=154421
+
+ Reviewed by Alex Christensen.
+
+ No new tests, as Modern IDB is still disabled for WK2.
+
+ But if you manually enable it, "Basic IndexedDB Seems To Work"
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<IDBGetResult>::encode): Deleted.
+ (IPC::ArgumentCoder<IDBGetResult>::decode): Deleted.
+ * Shared/WebCoreArgumentCoders.h:
+
+2016-02-18 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: Implement server->client operations in WK2.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154411
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (196785 => 196786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2016-02-19 00:27:15 UTC (rev 196785)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2016-02-19 00:42:01 UTC (rev 196786)
</span><span class="lines">@@ -1823,54 +1823,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><del>-#if ENABLE(INDEXED_DATABASE)
-
-void ArgumentCoder<IDBGetResult>::encode(ArgumentEncoder& encoder, const IDBGetResult& result)
-{
- bool nullData = !result.valueBuffer().data();
- encoder << nullData;
-
- if (!nullData)
- encoder << DataReference(result.valueBuffer().data()->data(), result.valueBuffer().data()->size());
-
- encoder << result.keyData() << result.keyPath();
-}
-
-bool ArgumentCoder<IDBGetResult>::decode(ArgumentDecoder& decoder, IDBGetResult& result)
-{
- bool nullData;
- if (!decoder.decode(nullData))
- return false;
-
- if (nullData)
- result.setValueBuffer({ });
- else {
- DataReference data;
- if (!decoder.decode(data))
- return false;
-
- Vector<uint8_t> vector(data.size());
- memcpy(vector.data(), data.data(), data.size());
- result.setValueBuffer(ThreadSafeDataBuffer::adoptVector(vector));
- }
-
- IDBKeyData keyData;
- if (!decoder.decode(keyData))
- return false;
-
- result.setKeyData(keyData);
-
- IDBKeyPath keyPath;
- if (!decoder.decode(keyPath))
- return false;
-
- result.setKeyPath(keyPath);
-
- return true;
-}
-
-#endif // ENABLE(INDEXED_DATABASE)
-
</del><span class="cx"> void ArgumentCoder<SessionID>::encode(ArgumentEncoder& encoder, const SessionID& sessionID)
</span><span class="cx"> {
</span><span class="cx"> encoder << sessionID.sessionID();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (196785 => 196786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-02-19 00:27:15 UTC (rev 196785)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-02-19 00:42:01 UTC (rev 196786)
</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 IDBGetResult;
</del><span class="cx"> class IntPoint;
</span><span class="cx"> class IntRect;
</span><span class="cx"> class IntSize;
</span><span class="lines">@@ -403,13 +402,6 @@
</span><span class="cx"> bool decodeFilterOperation(ArgumentDecoder&, RefPtr<WebCore::FilterOperation>&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(INDEXED_DATABASE)
-template<> struct ArgumentCoder<WebCore::IDBGetResult> {
- static void encode(ArgumentEncoder&, const WebCore::IDBGetResult&);
- static bool decode(ArgumentDecoder&, WebCore::IDBGetResult&);
-};
-#endif // ENABLE(INDEXED_DATABASE)
-
</del><span class="cx"> template<> struct ArgumentCoder<WebCore::SessionID> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::SessionID&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::SessionID&);
</span></span></pre>
</div>
</div>
</body>
</html>