content/renderer/indexed_db_dispatcher.cc - Issue 8747002: Dispatch IndexedDB IPC messages to worker threads

Unified Diff: content/renderer/indexed_db_dispatcher.cc

Issue 8747002: Dispatch IndexedDB IPC messages to worker threads (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove some includes Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/renderer/indexed_db_dispatcher.h ('K') | « content/renderer/indexed_db_dispatcher.h ('k') | content/renderer/indexed_db_message_filter.cc » ('j') | content/renderer/render_thread_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/indexed_db_dispatcher.cc

diff --git a/content/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db_dispatcher.cc

index 414c1a68bec8166cf7d84fd0b591e5b1b2b14ad1..64496da1a7dc266d946e1b2e5cc0f28dcde57cb6 100644

--- a/content/renderer/indexed_db_dispatcher.cc

+++ b/content/renderer/indexed_db_dispatcher.cc

@@ -12,13 +12,11 @@

#include "content/renderer/renderer_webidbindex_impl.h"

#include "content/renderer/renderer_webidbobjectstore_impl.h"

#include "content/renderer/renderer_webidbtransaction_impl.h"

+#include "ipc/ipc_channel.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h"

-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"

-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"

-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"

using WebKit::WebDOMStringList;

using WebKit::WebExceptionCode;

@@ -30,6 +28,18 @@ using WebKit::WebIDBDatabaseCallbacks;

using WebKit::WebIDBDatabaseError;

using WebKit::WebIDBTransaction;

using WebKit::WebIDBTransactionCallbacks;

+using webkit_glue::WorkerTaskRunner;

+base::ThreadLocalPointer<IndexedDBDispatcher>*

michaeln 2011/12/14 02:15:53 our convention is to use LazyInstance<> for things

dgrogan 2011/12/15 02:47:44 Done.

+ IndexedDBDispatcher::idb_dispatcher_tls_;

+namespace {

+int32 CurrentWorkerId() {

+ return WorkerTaskRunner::Instance()->CurrentWorkerId();

+} // unnamed namespace

IndexedDBDispatcher::IndexedDBDispatcher() {

}

@@ -37,7 +47,30 @@ IndexedDBDispatcher::IndexedDBDispatcher() {

IndexedDBDispatcher::~IndexedDBDispatcher() {

}

-bool IndexedDBDispatcher::OnMessageReceived(const IPC::Message& msg) {

+void IndexedDBDispatcher::Init() {

+ idb_dispatcher_tls_ = new base::ThreadLocalPointer<IndexedDBDispatcher>;

+IndexedDBDispatcher* IndexedDBDispatcher::Instance() {

+ DCHECK(idb_dispatcher_tls_) << "Call IndexedDBDispatcher::Init on the main "

+ << "thread before calling "

+ << "IndexedDBDispatcher::Instance";

+ if (idb_dispatcher_tls_->Get())

+ return idb_dispatcher_tls_->Get();

+ IndexedDBDispatcher* dispatcher = new IndexedDBDispatcher;

+ idb_dispatcher_tls_->Set(dispatcher);

+ if (WorkerTaskRunner::Instance()->CurrentWorkerId())

+ webkit_glue::WorkerTaskRunner::Instance()->AddStopObserver(dispatcher);

+ return dispatcher;

+void IndexedDBDispatcher::OnWorkerRunLoopStopped() {

+ idb_dispatcher_tls_->Set(NULL);

+ delete this;

+void IndexedDBDispatcher::OnMessageReceived(const IPC::Message& msg) {

bool handled = true;

IPC_BEGIN_MESSAGE_MAP(IndexedDBDispatcher, msg)

IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBCursor,

@@ -64,7 +97,9 @@ bool IndexedDBDispatcher::OnMessageReceived(const IPC::Message& msg) {

OnVersionChange)

IPC_MESSAGE_UNHANDLED(handled = false)

IPC_END_MESSAGE_MAP()

- return handled;

+ // If a message gets here, IndexedDBMessageFilter already determined that it

+ // is an IndexedDB message.

+ DCHECK(handled);

}

void IndexedDBDispatcher::Send(IPC::Message* msg) {

@@ -79,9 +114,11 @@ void IndexedDBDispatcher::RequestIDBCursorUpdate(

ResetCursorPrefetchCaches();

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

+ int32 thread_id = WorkerTaskRunner::Instance()->CurrentWorkerId();

int32 response_id = pending_callbacks_.Add(callbacks.release());

Send(

- new IndexedDBHostMsg_CursorUpdate(idb_cursor_id, response_id, value, ec));

+ new IndexedDBHostMsg_CursorUpdate(idb_cursor_id, thread_id, response_id,

michaeln 2011/12/14 02:15:53 maybe call your CurrentWorkerId() helper here as w

dgrogan 2011/12/15 02:47:44 Done.

+ value, ec));

if (*ec)

pending_callbacks_.Remove(response_id);

}

@@ -98,7 +135,8 @@ void IndexedDBDispatcher::RequestIDBCursorContinue(

int32 response_id = pending_callbacks_.Add(callbacks.release());

Send(

- new IndexedDBHostMsg_CursorContinue(idb_cursor_id, response_id, key, ec));

+ new IndexedDBHostMsg_CursorContinue(idb_cursor_id, CurrentWorkerId(),

+ response_id, key, ec));

if (*ec)

pending_callbacks_.Remove(response_id);

}

@@ -111,17 +149,17 @@ void IndexedDBDispatcher::RequestIDBCursorPrefetch(

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

int32 response_id = pending_callbacks_.Add(callbacks.release());

- RenderThreadImpl::current()->Send(

- new IndexedDBHostMsg_CursorPrefetch(idb_cursor_id, response_id, n, ec));

+ Send(new IndexedDBHostMsg_CursorPrefetch(idb_cursor_id, CurrentWorkerId(),

+ response_id, n, ec));

if (*ec)

pending_callbacks_.Remove(response_id);

}

void IndexedDBDispatcher::RequestIDBCursorPrefetchReset(

int used_prefetches, int unused_prefetches, int32 idb_cursor_id) {

- RenderThreadImpl::current()->Send(

- new IndexedDBHostMsg_CursorPrefetchReset(idb_cursor_id, used_prefetches,

- unused_prefetches));

+ Send(new IndexedDBHostMsg_CursorPrefetchReset(idb_cursor_id,

+ used_prefetches,

+ unused_prefetches));

}

void IndexedDBDispatcher::RequestIDBCursorDelete(

@@ -132,7 +170,8 @@ void IndexedDBDispatcher::RequestIDBCursorDelete(

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

int32 response_id = pending_callbacks_.Add(callbacks.release());

- Send(new IndexedDBHostMsg_CursorDelete(idb_cursor_id, response_id, ec));

+ Send(new IndexedDBHostMsg_CursorDelete(idb_cursor_id, CurrentWorkerId(),

+ response_id, ec));

if (*ec)

pending_callbacks_.Remove(response_id);

}

@@ -152,6 +191,7 @@ void IndexedDBDispatcher::RequestIDBFactoryOpen(

return; // We must be shutting down.

IndexedDBHostMsg_FactoryOpen_Params params;

+ params.thread_id = CurrentWorkerId();

params.response_id = pending_callbacks_.Add(callbacks.release());

params.origin = origin;

params.name = name;

@@ -172,6 +212,7 @@ void IndexedDBDispatcher::RequestIDBFactoryGetDatabaseNames(

return; // We must be shutting down.

IndexedDBHostMsg_FactoryGetDatabaseNames_Params params;

+ params.thread_id = CurrentWorkerId();

params.response_id = pending_callbacks_.Add(callbacks.release());

params.origin = origin;

Send(new IndexedDBHostMsg_FactoryGetDatabaseNames(params));

@@ -192,6 +233,7 @@ void IndexedDBDispatcher::RequestIDBFactoryDeleteDatabase(

return; // We must be shutting down.

IndexedDBHostMsg_FactoryDeleteDatabase_Params params;

+ params.thread_id = CurrentWorkerId();

params.response_id = pending_callbacks_.Add(callbacks.release());

params.origin = origin;

params.name = name;

@@ -210,8 +252,10 @@ void IndexedDBDispatcher::RequestIDBDatabaseOpen(

ResetCursorPrefetchCaches();

scoped_ptr<WebIDBDatabaseCallbacks> callbacks(callbacks_ptr);

- int32 response_id = pending_database_callbacks_.Add(callbacks.release());

- Send(new IndexedDBHostMsg_DatabaseOpen(response_id, idb_database_id));

+ DCHECK(!pending_database_callbacks_.Lookup(idb_database_id));

+ pending_database_callbacks_.AddWithID(callbacks.release(), idb_database_id);

+ Send(new IndexedDBHostMsg_DatabaseOpen(idb_database_id, CurrentWorkerId(),

+ idb_database_id));

}

void IndexedDBDispatcher::RequestIDBDatabaseSetVersion(

@@ -223,8 +267,9 @@ void IndexedDBDispatcher::RequestIDBDatabaseSetVersion(

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

int32 response_id = pending_callbacks_.Add(callbacks.release());

- Send(new IndexedDBHostMsg_DatabaseSetVersion(idb_database_id, response_id,

- version, ec));

+ Send(new IndexedDBHostMsg_DatabaseSetVersion(idb_database_id,

+ CurrentWorkerId(),

+ response_id, version, ec));

if (*ec)

pending_callbacks_.Remove(response_id);

}

@@ -239,6 +284,7 @@ void IndexedDBDispatcher::RequestIDBIndexOpenObjectCursor(

ResetCursorPrefetchCaches();

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

IndexedDBHostMsg_IndexOpenCursor_Params params;

+ params.thread_id = CurrentWorkerId();

params.response_id = pending_callbacks_.Add(callbacks.release());

params.lower_key.Set(idb_key_range.lower());

params.upper_key.Set(idb_key_range.upper());

@@ -262,6 +308,7 @@ void IndexedDBDispatcher::RequestIDBIndexOpenKeyCursor(

ResetCursorPrefetchCaches();

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

IndexedDBHostMsg_IndexOpenCursor_Params params;

+ params.thread_id = CurrentWorkerId();

params.response_id = pending_callbacks_.Add(callbacks.release());

// TODO(jorlow): We really should just create a Chromium abstraction for

// KeyRange rather than doing it ad-hoc like this.

@@ -286,7 +333,8 @@ void IndexedDBDispatcher::RequestIDBIndexGetObject(

ResetCursorPrefetchCaches();

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

int32 response_id = pending_callbacks_.Add(callbacks.release());

- Send(new IndexedDBHostMsg_IndexGetObject(idb_index_id, response_id, key,

+ Send(new IndexedDBHostMsg_IndexGetObject(idb_index_id, CurrentWorkerId(),

+ response_id, key,

TransactionId(transaction), ec));

if (*ec)

pending_callbacks_.Remove(response_id);

@@ -302,7 +350,7 @@ void IndexedDBDispatcher::RequestIDBIndexGetKey(

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

int32 response_id = pending_callbacks_.Add(callbacks.release());

Send(new IndexedDBHostMsg_IndexGetKey(

- idb_index_id, response_id, key,

+ idb_index_id, CurrentWorkerId(), response_id, key,

TransactionId(transaction), ec));

if (*ec)

pending_callbacks_.Remove(response_id);

@@ -319,7 +367,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreGet(

int32 response_id = pending_callbacks_.Add(callbacks.release());

Send(new IndexedDBHostMsg_ObjectStoreGet(

- idb_object_store_id, response_id,

+ idb_object_store_id, CurrentWorkerId(), response_id,

key, TransactionId(transaction), ec));

if (*ec)

pending_callbacks_.Remove(response_id);

@@ -336,6 +384,7 @@ void IndexedDBDispatcher::RequestIDBObjectStorePut(

ResetCursorPrefetchCaches();

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

IndexedDBHostMsg_ObjectStorePut_Params params;

+ params.thread_id = CurrentWorkerId();

params.idb_object_store_id = idb_object_store_id;

params.response_id = pending_callbacks_.Add(callbacks.release());

params.serialized_value = value;

@@ -358,7 +407,8 @@ void IndexedDBDispatcher::RequestIDBObjectStoreDelete(

int32 response_id = pending_callbacks_.Add(callbacks.release());

Send(new IndexedDBHostMsg_ObjectStoreDelete(

- idb_object_store_id, response_id, key, TransactionId(transaction), ec));

+ idb_object_store_id, CurrentWorkerId(), response_id, key,

+ TransactionId(transaction), ec));

if (*ec)

pending_callbacks_.Remove(response_id);

}

@@ -373,7 +423,8 @@ void IndexedDBDispatcher::RequestIDBObjectStoreClear(

int32 response_id = pending_callbacks_.Add(callbacks.release());

Send(new IndexedDBHostMsg_ObjectStoreClear(

- idb_object_store_id, response_id, TransactionId(transaction), ec));

+ idb_object_store_id, CurrentWorkerId(), response_id,

+ TransactionId(transaction), ec));

if (*ec)

pending_callbacks_.Remove(response_id);

}

@@ -388,6 +439,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreOpenCursor(

ResetCursorPrefetchCaches();

scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);

IndexedDBHostMsg_ObjectStoreOpenCursor_Params params;

+ params.thread_id = CurrentWorkerId();

params.response_id = pending_callbacks_.Add(callbacks.release());

params.lower_key.Set(idb_key_range.lower());

params.upper_key.Set(idb_key_range.upper());

@@ -418,7 +470,8 @@ int32 IndexedDBDispatcher::TransactionId(

return impl->id();

}

-void IndexedDBDispatcher::OnSuccessIDBDatabase(int32 response_id,

+void IndexedDBDispatcher::OnSuccessIDBDatabase(int32 thread_id,

michaeln 2011/12/14 02:15:53 maybe DCHECK_EQ(thread_id, CurrentWorkerId()) here

dgrogan 2011/12/15 02:47:44 Done.

+ int32 response_id,

int32 object_id) {

WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);

if (!callbacks)

@@ -427,7 +480,8 @@ void IndexedDBDispatcher::OnSuccessIDBDatabase(int32 response_id,

pending_callbacks_.Remove(response_id);

}

-void IndexedDBDispatcher::OnSuccessIndexedDBKey(int32 response_id,

+void IndexedDBDispatcher::OnSuccessIndexedDBKey(int32 thread_id,

+ int32 response_id,

const IndexedDBKey& key) {

WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);

if (!callbacks)

@@ -436,7 +490,8 @@ void IndexedDBDispatcher::OnSuccessIndexedDBKey(int32 response_id,

pending_callbacks_.Remove(response_id);

}

-void IndexedDBDispatcher::OnSuccessIDBTransaction(int32 response_id,

+void IndexedDBDispatcher::OnSuccessIDBTransaction(int32 thread_id,

+ int32 response_id,

int32 object_id) {

WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);

if (!callbacks)

@@ -446,7 +501,7 @@ void IndexedDBDispatcher::OnSuccessIDBTransaction(int32 response_id,

}

void IndexedDBDispatcher::OnSuccessStringList(

- int32 response_id, const std::vector<string16>& value) {

+ int32 thread_id, int32 response_id, const std::vector<string16>& value) {

WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);

if (!callbacks)

return;

@@ -459,7 +514,8 @@ void IndexedDBDispatcher::OnSuccessStringList(

}

void IndexedDBDispatcher::OnSuccessSerializedScriptValue(

- int32 response_id, const content::SerializedScriptValue& value) {

+ int32 thread_id, int32 response_id,

+ const content::SerializedScriptValue& value) {

WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);

if (!callbacks)

return;

@@ -467,9 +523,13 @@ void IndexedDBDispatcher::OnSuccessSerializedScriptValue(

pending_callbacks_.Remove(response_id);

}

-void IndexedDBDispatcher::OnSuccessOpenCursor(int32 repsonse_id,

- int32 object_id, const IndexedDBKey& key, const IndexedDBKey& primary_key,

- const content::SerializedScriptValue& value) {

+void IndexedDBDispatcher::OnSuccessOpenCursor(

+ const IndexedDBMsg_CallbacksSuccessIDBCursor_Params& p) {

+ int32 repsonse_id = p.response_id;

+ int32 object_id = p.cursor_id;

+ const IndexedDBKey& key = p.key;

+ const IndexedDBKey& primary_key = p.primary_key;

+ const content::SerializedScriptValue& value = p.serialized_value;

WebIDBCallbacks* callbacks =

pending_callbacks_.Lookup(repsonse_id);

if (!callbacks)

@@ -484,11 +544,12 @@ void IndexedDBDispatcher::OnSuccessOpenCursor(int32 repsonse_id,

}

void IndexedDBDispatcher::OnSuccessCursorContinue(

- int32 response_id,

- int32 cursor_id,

- const IndexedDBKey& key,

- const IndexedDBKey& primary_key,

- const content::SerializedScriptValue& value) {

+ const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p) {

+ int32 response_id = p.response_id;

+ int32 cursor_id = p.cursor_id;

+ const IndexedDBKey& key = p.key;

+ const IndexedDBKey& primary_key = p.primary_key;

+ const content::SerializedScriptValue& value = p.serialized_value;

RendererWebIDBCursorImpl* cursor = cursors_[cursor_id];

DCHECK(cursor);

cursor->SetKeyAndValue(key, primary_key, value);

@@ -502,11 +563,12 @@ void IndexedDBDispatcher::OnSuccessCursorContinue(

}

void IndexedDBDispatcher::OnSuccessCursorPrefetch(

- int32 response_id,

- int32 cursor_id,

- const std::vector<IndexedDBKey>& keys,

- const std::vector<IndexedDBKey>& primary_keys,

- const std::vector<content::SerializedScriptValue>& values) {

+ const IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params& p) {

+ int32 response_id = p.response_id;

+ int32 cursor_id = p.cursor_id;

+ const std::vector<IndexedDBKey>& keys = p.keys;

+ const std::vector<IndexedDBKey>& primary_keys = p.primary_keys;

+ const std::vector<content::SerializedScriptValue>& values = p.values;

RendererWebIDBCursorImpl* cursor = cursors_[cursor_id];

DCHECK(cursor);

cursor->SetPrefetchData(keys, primary_keys, values);

@@ -516,12 +578,12 @@ void IndexedDBDispatcher::OnSuccessCursorPrefetch(

pending_callbacks_.Remove(response_id);

}

-void IndexedDBDispatcher::OnBlocked(int32 response_id) {

+void IndexedDBDispatcher::OnBlocked(int32 thread_id, int32 response_id) {

WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);

callbacks->onBlocked();

}

-void IndexedDBDispatcher::OnError(int32 response_id, int code,

+void IndexedDBDispatcher::OnError(int32 thread_id, int32 response_id, int code,

const string16& message) {

WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);

if (!callbacks)

@@ -530,7 +592,7 @@ void IndexedDBDispatcher::OnError(int32 response_id, int code,

pending_callbacks_.Remove(response_id);

}

-void IndexedDBDispatcher::OnAbort(int32 transaction_id) {

+void IndexedDBDispatcher::OnAbort(int32 thread_id, int32 transaction_id) {

WebIDBTransactionCallbacks* callbacks =

pending_transaction_callbacks_.Lookup(transaction_id);

if (!callbacks)

@@ -539,7 +601,7 @@ void IndexedDBDispatcher::OnAbort(int32 transaction_id) {

pending_transaction_callbacks_.Remove(transaction_id);

}

-void IndexedDBDispatcher::OnComplete(int32 transaction_id) {

+void IndexedDBDispatcher::OnComplete(int32 thread_id, int32 transaction_id) {

WebIDBTransactionCallbacks* callbacks =

pending_transaction_callbacks_.Lookup(transaction_id);

if (!callbacks)

@@ -548,7 +610,8 @@ void IndexedDBDispatcher::OnComplete(int32 transaction_id) {

pending_transaction_callbacks_.Remove(transaction_id);

}

-void IndexedDBDispatcher::OnVersionChange(int32 database_id,

+void IndexedDBDispatcher::OnVersionChange(int32 thread_id,

+ int32 database_id,

const string16& newVersion) {

WebIDBDatabaseCallbacks* callbacks =

pending_database_callbacks_.Lookup(database_id);