<!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>[201665] 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/201665">201665</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-06-03 15:31:02 -0700 (Fri, 03 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>More miscellaneous IDBBindingUtilities cleanup.
https://bugs.webkit.org/show_bug.cgi?id=158359

Reviewed by Tim Horton.

No new tests (Straight refactor, yo).

Replace more ScriptExecutionContext&amp;s with ExecState&amp;s.
Combine more unnecessarily separate functions.
Remove some cruft.

* Modules/indexeddb/IDBCursor.cpp:
(WebCore::IDBCursor::setGetResult):

* Modules/indexeddb/IDBRequest.cpp:
(WebCore::IDBRequest::setResult):
(WebCore::IDBRequest::setResultToStructuredClone):

* Modules/indexeddb/server/MemoryObjectStore.cpp:
(WebCore::IDBServer::MemoryObjectStore::updateIndexesForPutRecord):
(WebCore::IDBServer::MemoryObjectStore::populateIndexWithExistingRecords):

* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::updateOneIndexForAddRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::updateAllIndexesForAddRecord):

* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::performPutOrAdd):

* bindings/js/IDBBindingUtilities.cpp:
(WebCore::deserializeIDBValueToJSValue):
(WebCore::idbKeyDataToScriptValue):
(WebCore::deserializeIDBValueDataToJSValue): Deleted.
* bindings/js/IDBBindingUtilities.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiesh">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201664 => 201665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-06-03 22:26:50 UTC (rev 201664)
+++ trunk/Source/WebCore/ChangeLog        2016-06-03 22:31:02 UTC (rev 201665)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-06-03  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        More miscellaneous IDBBindingUtilities cleanup.
+        https://bugs.webkit.org/show_bug.cgi?id=158359
+
+        Reviewed by Tim Horton.
+
+        No new tests (Straight refactor, yo).
+
+        Replace more ScriptExecutionContext&amp;s with ExecState&amp;s.
+        Combine more unnecessarily separate functions.
+        Remove some cruft.
+        
+        * Modules/indexeddb/IDBCursor.cpp:
+        (WebCore::IDBCursor::setGetResult):
+        
+        * Modules/indexeddb/IDBRequest.cpp:
+        (WebCore::IDBRequest::setResult):
+        (WebCore::IDBRequest::setResultToStructuredClone):
+        
+        * Modules/indexeddb/server/MemoryObjectStore.cpp:
+        (WebCore::IDBServer::MemoryObjectStore::updateIndexesForPutRecord):
+        (WebCore::IDBServer::MemoryObjectStore::populateIndexWithExistingRecords):
+        
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+        (WebCore::IDBServer::SQLiteIDBBackingStore::updateOneIndexForAddRecord):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::updateAllIndexesForAddRecord):
+        
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::performPutOrAdd):
+        
+        * bindings/js/IDBBindingUtilities.cpp:
+        (WebCore::deserializeIDBValueToJSValue):
+        (WebCore::idbKeyDataToScriptValue):
+        (WebCore::deserializeIDBValueDataToJSValue): Deleted.
+        * bindings/js/IDBBindingUtilities.h:
+
</ins><span class="cx"> 2016-06-03  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         CanvasRenderingContext2D.createPattern() / putImageData() throw wrong exception type
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp (201664 => 201665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp        2016-06-03 22:26:50 UTC (rev 201664)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp        2016-06-03 22:31:02 UTC (rev 201665)
</span><span class="lines">@@ -399,6 +399,10 @@
</span><span class="cx">     if (!context)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    auto* exec = context-&gt;execState();
+    if (!exec)
+        return;
+
</ins><span class="cx">     if (!getResult.isDefined()) {
</span><span class="cx">         m_currentKey = { };
</span><span class="cx">         m_currentKeyData = { };
</span><span class="lines">@@ -412,13 +416,13 @@
</span><span class="cx"> 
</span><span class="cx">     auto&amp; vm = context-&gt;vm();
</span><span class="cx"> 
</span><del>-    m_currentKey = { vm, idbKeyDataToScriptValue(*context, getResult.keyData()) };
</del><ins>+    m_currentKey = { vm, idbKeyDataToScriptValue(*exec, getResult.keyData()) };
</ins><span class="cx">     m_currentKeyData = getResult.keyData();
</span><del>-    m_currentPrimaryKey = { vm, idbKeyDataToScriptValue(*context, getResult.primaryKeyData()) };
</del><ins>+    m_currentPrimaryKey = { vm, idbKeyDataToScriptValue(*exec, getResult.primaryKeyData()) };
</ins><span class="cx">     m_currentPrimaryKeyData = getResult.primaryKeyData();
</span><span class="cx"> 
</span><span class="cx">     if (isKeyCursorWithValue())
</span><del>-        m_currentValue = { vm, deserializeIDBValueToJSValue(*context, getResult.value()) };
</del><ins>+        m_currentValue = { vm, deserializeIDBValueToJSValue(*exec, getResult.value()) };
</ins><span class="cx">     else
</span><span class="cx">         m_currentValue = { };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (201664 => 201665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp        2016-06-03 22:26:50 UTC (rev 201664)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp        2016-06-03 22:31:02 UTC (rev 201665)
</span><span class="lines">@@ -330,8 +330,12 @@
</span><span class="cx">     if (!context)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    auto* exec = context-&gt;execState();
+    if (!exec)
+        return;
+
</ins><span class="cx">     clearResult();
</span><del>-    m_scriptResult = { context-&gt;vm(), idbKeyDataToScriptValue(*context, keyData) };
</del><ins>+    m_scriptResult = { context-&gt;vm(), idbKeyDataToScriptValue(*exec, keyData) };
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void IDBRequest::setResult(uint64_t number)
</span><span class="lines">@@ -356,8 +360,12 @@
</span><span class="cx">     if (!context)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    auto* exec = context-&gt;execState();
+    if (!exec)
+        return;
+
</ins><span class="cx">     clearResult();
</span><del>-    m_scriptResult = { context-&gt;vm(), deserializeIDBValueToJSValue(*context, value) };
</del><ins>+    m_scriptResult = { context-&gt;vm(), deserializeIDBValueToJSValue(*exec, value) };
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void IDBRequest::clearResult()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp (201664 => 201665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp        2016-06-03 22:26:50 UTC (rev 201664)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp        2016-06-03 22:31:02 UTC (rev 201665)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> {
</span><span class="cx">     JSLockHolder locker(UniqueIDBDatabase::databaseThreadVM());
</span><span class="cx"> 
</span><del>-    auto jsValue = deserializeIDBValueDataToJSValue(UniqueIDBDatabase::databaseThreadExecState(), value);
</del><ins>+    auto jsValue = deserializeIDBValueToJSValue(UniqueIDBDatabase::databaseThreadExecState(), value);
</ins><span class="cx">     if (jsValue.isUndefinedOrNull())
</span><span class="cx">         return { };
</span><span class="cx"> 
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx">     JSLockHolder locker(UniqueIDBDatabase::databaseThreadVM());
</span><span class="cx"> 
</span><span class="cx">     for (auto iterator : *m_keyValueStore) {
</span><del>-        auto jsValue = deserializeIDBValueDataToJSValue(UniqueIDBDatabase::databaseThreadExecState(), iterator.value);
</del><ins>+        auto jsValue = deserializeIDBValueToJSValue(UniqueIDBDatabase::databaseThreadExecState(), iterator.value);
</ins><span class="cx">         if (jsValue.isUndefinedOrNull())
</span><span class="cx">             return { };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (201664 => 201665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp        2016-06-03 22:26:50 UTC (rev 201664)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp        2016-06-03 22:31:02 UTC (rev 201665)
</span><span class="lines">@@ -1480,7 +1480,7 @@
</span><span class="cx"> {
</span><span class="cx">     JSLockHolder locker(vm());
</span><span class="cx"> 
</span><del>-    auto jsValue = deserializeIDBValueDataToJSValue(*globalObject().globalExec(), value);
</del><ins>+    auto jsValue = deserializeIDBValueToJSValue(*globalObject().globalExec(), value);
</ins><span class="cx">     if (jsValue.isUndefinedOrNull())
</span><span class="cx">         return { };
</span><span class="cx"> 
</span><span class="lines">@@ -1497,7 +1497,7 @@
</span><span class="cx"> {
</span><span class="cx">     JSLockHolder locker(vm());
</span><span class="cx"> 
</span><del>-    auto jsValue = deserializeIDBValueDataToJSValue(*globalObject().globalExec(), value);
</del><ins>+    auto jsValue = deserializeIDBValueToJSValue(*globalObject().globalExec(), value);
</ins><span class="cx">     if (jsValue.isUndefinedOrNull())
</span><span class="cx">         return { };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (201664 => 201665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2016-06-03 22:26:50 UTC (rev 201664)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2016-06-03 22:31:02 UTC (rev 201665)
</span><span class="lines">@@ -851,7 +851,7 @@
</span><span class="cx">     if (usedKeyIsGenerated &amp;&amp; !objectStoreInfo-&gt;keyPath().isNull()) {
</span><span class="cx">         JSLockHolder locker(databaseThreadVM());
</span><span class="cx"> 
</span><del>-        auto value = deserializeIDBValueDataToJSValue(databaseThreadExecState(), originalRecordValue.data());
</del><ins>+        auto value = deserializeIDBValueToJSValue(databaseThreadExecState(), originalRecordValue.data());
</ins><span class="cx">         if (value.isUndefined()) {
</span><span class="cx">             postDatabaseTaskReply(createCrossThreadTask(*this, &amp;UniqueIDBDatabase::didPerformPutOrAdd, callbackIdentifier, IDBError(IDBDatabaseException::ConstraintError, ASCIILiteral(&quot;Unable to deserialize record value for record key injection&quot;)), usedKey));
</span><span class="cx">             return;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (201664 => 201665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp        2016-06-03 22:26:50 UTC (rev 201664)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp        2016-06-03 22:31:02 UTC (rev 201665)
</span><span class="lines">@@ -307,8 +307,7 @@
</span><span class="cx">     return canInjectNthValueOnKeyPath(exec, scriptValue, keyPathElements, keyPathElements.size() - 1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-
-static JSValue deserializeIDBValueToJSValue(ExecState&amp; exec, const IDBValue&amp; value)
</del><ins>+JSValue deserializeIDBValueToJSValue(ExecState&amp; exec, const IDBValue&amp; value)
</ins><span class="cx"> {
</span><span class="cx">     // FIXME: I think it's peculiar to use undefined to mean &quot;null data&quot; and null to mean &quot;empty data&quot;.
</span><span class="cx">     // But I am not changing this at the moment because at least some callers are specifically checking isUndefined.
</span><span class="lines">@@ -329,36 +328,15 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue deserializeIDBValueToJSValue(ScriptExecutionContext&amp; context, const IDBValue&amp; value)
-{
-    // FIXME: I think it's peculiar to return an empty JSValue, undefined, and null for three different error cases.
-
-    auto* exec = context.execState();
-    if (!exec)
-        return { };
-
-    return deserializeIDBValueToJSValue(*exec, value);
-}
-
-JSValue deserializeIDBValueDataToJSValue(ExecState&amp; exec, const ThreadSafeDataBuffer&amp; valueData)
-{
-    return deserializeIDBValueToJSValue(exec, IDBValue(valueData));
-}
-
</del><span class="cx"> Ref&lt;IDBKey&gt; scriptValueToIDBKey(ExecState&amp; exec, const JSValue&amp; scriptValue)
</span><span class="cx"> {
</span><span class="cx">     return createIDBKeyFromValue(exec, scriptValue);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSC::JSValue idbKeyDataToScriptValue(ScriptExecutionContext&amp; context, const IDBKeyData&amp; keyData)
</del><ins>+JSC::JSValue idbKeyDataToScriptValue(JSC::ExecState&amp; exec, const IDBKeyData&amp; keyData)
</ins><span class="cx"> {
</span><span class="cx">     RefPtr&lt;IDBKey&gt; key = keyData.maybeCreateIDBKey();
</span><del>-
-    ExecState* exec = context.execState();
-    if (!exec)
-        return { };
-
-    return toJS(*exec, *exec-&gt;lexicalGlobalObject(), key.get());
</del><ins>+    return toJS(exec, *exec.lexicalGlobalObject(), key.get());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static Vector&lt;IDBKeyData&gt; createKeyPathArray(ExecState&amp; exec, JSValue value, const IDBIndexInfo&amp; info)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h (201664 => 201665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h        2016-06-03 22:26:50 UTC (rev 201664)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.h        2016-06-03 22:31:02 UTC (rev 201665)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> class IDBValue;
</span><span class="cx"> class IndexKey;
</span><span class="cx"> class JSDOMGlobalObject;
</span><del>-class ScriptExecutionContext;
</del><span class="cx"> class ThreadSafeDataBuffer;
</span><span class="cx"> 
</span><span class="cx"> IDBKeyPath idbKeyPathFromValue(JSC::ExecState&amp;, JSC::JSValue);
</span><span class="lines">@@ -56,11 +55,10 @@
</span><span class="cx"> bool injectIDBKeyIntoScriptValue(JSC::ExecState&amp;, const IDBKeyData&amp;, JSC::JSValue, const IDBKeyPath&amp;);
</span><span class="cx"> 
</span><span class="cx"> JSC::JSValue toJS(JSC::ExecState&amp;, JSC::JSGlobalObject&amp;, IDBKey*);
</span><del>-JSC::JSValue idbKeyDataToScriptValue(ScriptExecutionContext&amp;, const IDBKeyData&amp;);
</del><ins>+JSC::JSValue idbKeyDataToScriptValue(JSC::ExecState&amp;, const IDBKeyData&amp;);
</ins><span class="cx"> void generateIndexKeyForValue(JSC::ExecState&amp;, const IDBIndexInfo&amp;, JSC::JSValue, IndexKey&amp; outKey);
</span><span class="cx"> 
</span><del>-JSC::JSValue deserializeIDBValueToJSValue(ScriptExecutionContext&amp;, const IDBValue&amp;);
-JSC::JSValue deserializeIDBValueDataToJSValue(JSC::ExecState&amp;, const ThreadSafeDataBuffer&amp; valueData);
</del><ins>+JSC::JSValue deserializeIDBValueToJSValue(JSC::ExecState&amp;, const IDBValue&amp;);
</ins><span class="cx"> 
</span><span class="cx"> Ref&lt;IDBKey&gt; scriptValueToIDBKey(JSC::ExecState&amp;, const JSC::JSValue&amp;);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>