<!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>[200503] 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/200503">200503</a></dd>

<dt>Author</dt> <dd>beidson@apple.com</dd>

<dt>Date</dt> <dd>2016-05-05 19:33:20 -0700 (Thu, 05 May 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Modern IDB (Workers): Get everything to the right threads.

https://bugs.webkit.org/show_bug.cgi?id=157398

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (No current change in behavior, will be tested as bug 149953 is resolved, enabling IDB in workers).

* dom/ScriptExecutionContext.h:

(WebCore::ScriptExecutionContext::postCrossThreadTask): Add a helper to post a CrossThreadTask to a context.

* Modules/indexeddb/client/IDBConnectionProxy.cpp:

(WebCore::IDBClient::performCallbackOnCorrectThread): Helper to perform an IDB callback on either the main thread

  or Worker thread as necessary.

(WebCore::IDBClient::IDBConnectionProxy::openDatabase):

(WebCore::IDBClient::IDBConnectionProxy::deleteDatabase):

(WebCore::IDBClient::IDBConnectionProxy::completeOpenDBRequest):

(WebCore::IDBClient::IDBConnectionProxy::createObjectStore):

(WebCore::IDBClient::IDBConnectionProxy::deleteObjectStore):

(WebCore::IDBClient::IDBConnectionProxy::clearObjectStore):

(WebCore::IDBClient::IDBConnectionProxy::createIndex):

(WebCore::IDBClient::IDBConnectionProxy::deleteIndex):

(WebCore::IDBClient::IDBConnectionProxy::putOrAdd):

(WebCore::IDBClient::IDBConnectionProxy::getRecord):

(WebCore::IDBClient::IDBConnectionProxy::getCount):

(WebCore::IDBClient::IDBConnectionProxy::deleteRecord):

(WebCore::IDBClient::IDBConnectionProxy::openCursor):

(WebCore::IDBClient::IDBConnectionProxy::iterateCursor):

(WebCore::IDBClient::IDBConnectionProxy::completeOperation):

(WebCore::IDBClient::IDBConnectionProxy::abortOpenAndUpgradeNeeded):

(WebCore::IDBClient::IDBConnectionProxy::fireVersionChangeEvent):

(WebCore::IDBClient::IDBConnectionProxy::didFireVersionChangeEvent):

(WebCore::IDBClient::IDBConnectionProxy::notifyOpenDBRequestBlocked):

(WebCore::IDBClient::IDBConnectionProxy::establishTransaction):

(WebCore::IDBClient::IDBConnectionProxy::didStartTransaction):

(WebCore::IDBClient::IDBConnectionProxy::commitTransaction):

(WebCore::IDBClient::IDBConnectionProxy::didCommitTransaction):

(WebCore::IDBClient::IDBConnectionProxy::abortTransaction):

(WebCore::IDBClient::IDBConnectionProxy::didAbortTransaction):

(WebCore::IDBClient::IDBConnectionProxy::didFinishHandlingVersionChangeTransaction):

(WebCore::IDBClient::IDBConnectionProxy::databaseConnectionClosed):

(WebCore::IDBClient::IDBConnectionProxy::scheduleMainThreadTasks):

(WebCore::IDBClient::IDBConnectionProxy::handleMainThreadTasks):

* Modules/indexeddb/client/IDBConnectionProxy.h:

(WebCore::IDBClient::IDBConnectionProxy::callConnectionOnMainThread): Helper to marshall IDB operations from the

  Worker thread to the main thread.

(WebCore::IDBClient::IDBConnectionProxy::postMainThreadTask):

* Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::originThreadID):

* Modules/indexeddb/IDBTransaction.h:

* Modules/indexeddb/client/IDBConnectionToServer.cpp:

(WebCore::IDBClient::IDBConnectionToServer::putOrAdd):

* Modules/indexeddb/client/IDBConnectionToServer.h:

* Modules/indexeddb/client/IDBConnectionToServerDelegate.h:

* Modules/indexeddb/client/TransactionOperation.cpp:

(WebCore::IDBClient::TransactionOperation::scriptExecutionContext):

* Modules/indexeddb/client/TransactionOperation.h:

* Modules/indexeddb/shared/IDBResourceIdentifier.cpp:

(WebCore::nextClientResourceNumber):

* Modules/indexeddb/shared/InProcessIDBServer.cpp:

(WebCore::InProcessIDBServer::putOrAdd):

* Modules/indexeddb/shared/InProcessIDBServer.h:

Source/WebKit2:

* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:

(WebKit::WebIDBConnectionToServer::putOrAdd):

* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionh">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerDelegateh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientTransactionOperationcpp">trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientTransactionOperationh">trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifiercpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServerh">trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h</a></li>

<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServercpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServerh">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200502 => 200503)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-05-06 02:30:51 UTC (rev 200502)

+++ trunk/Source/WebCore/ChangeLog        2016-05-06 02:33:20 UTC (rev 200503)

</span><span class="lines">@@ -1,3 +1,73 @@

</span><ins>+2016-05-05  Brady Eidson  &lt;beidson@apple.com&gt;

+

+        Modern IDB (Workers): Get everything to the right threads.

+        https://bugs.webkit.org/show_bug.cgi?id=157398

+

+        Reviewed by Alex Christensen.

+

+        No new tests (No current change in behavior, will be tested as bug 149953 is resolved, enabling IDB in workers).

+

+        * dom/ScriptExecutionContext.h:

+        (WebCore::ScriptExecutionContext::postCrossThreadTask): Add a helper to post a CrossThreadTask to a context.

+                

+        * Modules/indexeddb/client/IDBConnectionProxy.cpp:

+        (WebCore::IDBClient::performCallbackOnCorrectThread): Helper to perform an IDB callback on either the main thread

+          or Worker thread as necessary.

+        (WebCore::IDBClient::IDBConnectionProxy::openDatabase):

+        (WebCore::IDBClient::IDBConnectionProxy::deleteDatabase):

+        (WebCore::IDBClient::IDBConnectionProxy::completeOpenDBRequest):

+        (WebCore::IDBClient::IDBConnectionProxy::createObjectStore):

+        (WebCore::IDBClient::IDBConnectionProxy::deleteObjectStore):

+        (WebCore::IDBClient::IDBConnectionProxy::clearObjectStore):

+        (WebCore::IDBClient::IDBConnectionProxy::createIndex):

+        (WebCore::IDBClient::IDBConnectionProxy::deleteIndex):

+        (WebCore::IDBClient::IDBConnectionProxy::putOrAdd):

+        (WebCore::IDBClient::IDBConnectionProxy::getRecord):

+        (WebCore::IDBClient::IDBConnectionProxy::getCount):

+        (WebCore::IDBClient::IDBConnectionProxy::deleteRecord):

+        (WebCore::IDBClient::IDBConnectionProxy::openCursor):

+        (WebCore::IDBClient::IDBConnectionProxy::iterateCursor):

+        (WebCore::IDBClient::IDBConnectionProxy::completeOperation):

+        (WebCore::IDBClient::IDBConnectionProxy::abortOpenAndUpgradeNeeded):

+        (WebCore::IDBClient::IDBConnectionProxy::fireVersionChangeEvent):

+        (WebCore::IDBClient::IDBConnectionProxy::didFireVersionChangeEvent):

+        (WebCore::IDBClient::IDBConnectionProxy::notifyOpenDBRequestBlocked):

+        (WebCore::IDBClient::IDBConnectionProxy::establishTransaction):

+        (WebCore::IDBClient::IDBConnectionProxy::didStartTransaction):

+        (WebCore::IDBClient::IDBConnectionProxy::commitTransaction):

+        (WebCore::IDBClient::IDBConnectionProxy::didCommitTransaction):

+        (WebCore::IDBClient::IDBConnectionProxy::abortTransaction):

+        (WebCore::IDBClient::IDBConnectionProxy::didAbortTransaction):

+        (WebCore::IDBClient::IDBConnectionProxy::didFinishHandlingVersionChangeTransaction):

+        (WebCore::IDBClient::IDBConnectionProxy::databaseConnectionClosed):

+        (WebCore::IDBClient::IDBConnectionProxy::scheduleMainThreadTasks):

+        (WebCore::IDBClient::IDBConnectionProxy::handleMainThreadTasks):

+        * Modules/indexeddb/client/IDBConnectionProxy.h:

+        (WebCore::IDBClient::IDBConnectionProxy::callConnectionOnMainThread): Helper to marshall IDB operations from the

+          Worker thread to the main thread.

+        (WebCore::IDBClient::IDBConnectionProxy::postMainThreadTask):

+

+        * Modules/indexeddb/IDBTransaction.cpp:

+        (WebCore::IDBTransaction::originThreadID):

+        * Modules/indexeddb/IDBTransaction.h:

+        

+        * Modules/indexeddb/client/IDBConnectionToServer.cpp:

+        (WebCore::IDBClient::IDBConnectionToServer::putOrAdd):

+        * Modules/indexeddb/client/IDBConnectionToServer.h:

+

+        * Modules/indexeddb/client/IDBConnectionToServerDelegate.h:

+

+        * Modules/indexeddb/client/TransactionOperation.cpp:

+        (WebCore::IDBClient::TransactionOperation::scriptExecutionContext):

+        * Modules/indexeddb/client/TransactionOperation.h:

+

+        * Modules/indexeddb/shared/IDBResourceIdentifier.cpp:

+        (WebCore::nextClientResourceNumber):

+

+        * Modules/indexeddb/shared/InProcessIDBServer.cpp:

+        (WebCore::InProcessIDBServer::putOrAdd):

+        * Modules/indexeddb/shared/InProcessIDBServer.h:

+

</ins><span class="cx"> 2016-05-05  Dean Jackson  &lt;dino@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         4 and 8 digit color attributes should use the crazypants algorithm, not the CSS one.

</span></span></pre></div>

<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (200502 => 200503)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp        2016-05-06 02:30:51 UTC (rev 200502)

+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp        2016-05-06 02:33:20 UTC (rev 200503)

</span><span class="lines">@@ -1064,6 +1064,11 @@

</span><span class="cx">     scheduleOperationTimer();

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+ThreadIdentifier IDBTransaction::originThreadID() const

+{

+    return m_database-&gt;originThreadID();

+}

+

</ins><span class="cx"> } // namespace WebCore

</span><span class="cx"> 

</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)

</span></span></pre></div>

<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (200502 => 200503)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h        2016-05-06 02:30:51 UTC (rev 200502)

+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h        2016-05-06 02:33:20 UTC (rev 200503)

</span><span class="lines">@@ -143,6 +143,8 @@

</span><span class="cx"> 

</span><span class="cx">     IDBClient::IDBConnectionProxy&amp; connectionProxy();

</span><span class="cx"> 

</span><ins>+    ThreadIdentifier originThreadID() const;

+

</ins><span class="cx"> private:

</span><span class="cx">     IDBTransaction(IDBDatabase&amp;, const IDBTransactionInfo&amp;, IDBOpenDBRequest*);

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (200502 => 200503)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp        2016-05-06 02:30:51 UTC (rev 200502)

+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp        2016-05-06 02:33:20 UTC (rev 200503)

</span><span class="lines">@@ -28,16 +28,36 @@

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)

</span><span class="cx"> 

</span><ins>+#include &quot;IDBCursorInfo.h&quot;

</ins><span class="cx"> #include &quot;IDBDatabase.h&quot;

</span><ins>+#include &quot;IDBKeyRangeData.h&quot;

</ins><span class="cx"> #include &quot;IDBOpenDBRequest.h&quot;

</span><span class="cx"> #include &quot;IDBRequestData.h&quot;

</span><span class="cx"> #include &quot;IDBResultData.h&quot;

</span><ins>+#include &quot;ScriptExecutionContext.h&quot;

</ins><span class="cx"> #include &quot;SecurityOrigin.h&quot;

</span><span class="cx"> #include &lt;wtf/MainThread.h&gt;

</span><span class="cx"> 

</span><span class="cx"> namespace WebCore {

</span><span class="cx"> namespace IDBClient {

</span><span class="cx"> 

</span><ins>+template&lt;typename T, typename... Parameters, typename... Arguments&gt;

+void performCallbackOnCorrectThread(T&amp; object, void (T::*method)(Parameters...), Arguments&amp;&amp;... arguments)

+{

+    ASSERT(isMainThread());

+

+    if (object.originThreadID() == currentThread()) {

+        (object.*method)(arguments...);

+        return;

+    }

+

+    ScriptExecutionContext* context = object.scriptExecutionContext();

+    if (!context)

+        return;

+

+    context-&gt;postCrossThreadTask(object, method, arguments...);

+}

+

</ins><span class="cx"> IDBConnectionProxy::IDBConnectionProxy(IDBConnectionToServer&amp; connection)

</span><span class="cx">     : m_connectionToServer(connection)

</span><span class="cx">     , m_serverConnectionIdentifier(connection.identifier())

</span><span class="lines">@@ -57,10 +77,6 @@

</span><span class="cx"> 

</span><span class="cx"> RefPtr&lt;IDBOpenDBRequest&gt; IDBConnectionProxy::openDatabase(ScriptExecutionContext&amp; context, const IDBDatabaseIdentifier&amp; databaseIdentifier, uint64_t version)

</span><span class="cx"> {

</span><del>-    // FIXME: Handle Workers

-    if (!isMainThread())

-        return nullptr;

-

</del><span class="cx">     RefPtr&lt;IDBOpenDBRequest&gt; request;

</span><span class="cx">     {

</span><span class="cx">         Locker&lt;Lock&gt; locker(m_openDBRequestMapLock);

</span><span class="lines">@@ -70,20 +86,13 @@

</span><span class="cx">         m_openDBRequestMap.set(request-&gt;resourceIdentifier(), request.get());

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    IDBRequestData requestData(*this, *request);

</del><ins>+    callConnectionOnMainThread(&amp;IDBConnectionToServer::openDatabase, IDBRequestData(*this, *request));

</ins><span class="cx"> 

<del>-    // FIXME: For workers, marshall this to the main thread if necessary.

-    m_connectionToServer.openDatabase(requestData);

-

</del><span class="cx">     return request;

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> RefPtr&lt;IDBOpenDBRequest&gt; IDBConnectionProxy::deleteDatabase(ScriptExecutionContext&amp; context, const IDBDatabaseIdentifier&amp; databaseIdentifier)

</span><span class="cx"> {

</span><del>-    // FIXME: Handle Workers

-    if (!isMainThread())

-        return nullptr;

-

</del><span class="cx">     RefPtr&lt;IDBOpenDBRequest&gt; request;

</span><span class="cx">     {

</span><span class="cx">         Locker&lt;Lock&gt; locker(m_openDBRequestMapLock);

</span><span class="lines">@@ -93,11 +102,8 @@

</span><span class="cx">         m_openDBRequestMap.set(request-&gt;resourceIdentifier(), request.get());

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    IDBRequestData requestData(*this, *request);

</del><ins>+    callConnectionOnMainThread(&amp;IDBConnectionToServer::deleteDatabase, IDBRequestData(*this, *request));

</ins><span class="cx"> 

<del>-    // FIXME: For workers, marshall this to the main thread if necessary.

-    m_connectionToServer.deleteDatabase(requestData);

-

</del><span class="cx">     return request;

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -118,121 +124,101 @@

</span><span class="cx">     RefPtr&lt;IDBOpenDBRequest&gt; request;

</span><span class="cx">     {

</span><span class="cx">         Locker&lt;Lock&gt; locker(m_openDBRequestMapLock);

</span><del>-        request = m_openDBRequestMap.get(resultData.requestIdentifier());

</del><ins>+        request = m_openDBRequestMap.take(resultData.requestIdentifier());

</ins><span class="cx">         ASSERT(request);

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    request-&gt;requestCompleted(resultData);

</del><ins>+    ASSERT(request);

+

+    performCallbackOnCorrectThread(*request, &amp;IDBOpenDBRequest::requestCompleted, resultData);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void IDBConnectionProxy::createObjectStore(TransactionOperation&amp; operation, const IDBObjectStoreInfo&amp; info)

</span><span class="cx"> {

</span><del>-    IDBRequestData requestData(operation);

</del><ins>+    const IDBRequestData requestData(operation);

</ins><span class="cx">     saveOperation(operation);

</span><span class="cx"> 