Index: content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
index b267f88f5f3ab136da8dfdf7cead4563f11e608b..dbc9f56c7596df9b88103473c8e04a357b7235df 100644 |
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
@@ -4,6 +4,8 @@ |
#include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h" |
+#include <vector> |
+ |
#include "base/bind.h" |
#include "base/command_line.h" |
#include "base/utf_string_conversions.h" |
@@ -61,7 +63,6 @@ void DeleteOnWebKitThread(T* obj) { |
FROM_HERE, obj)) |
delete obj; |
} |
- |
dgrogan
2012/08/02 20:27:32
Lint told you to remove this line? Should line 57
alecflett
2012/08/02 21:25:05
I think it's because it is at the END of a scope..
|
} |
IndexedDBDispatcherHost::IndexedDBDispatcherHost( |
@@ -278,17 +279,6 @@ ObjectType* IndexedDBDispatcherHost::GetOrTerminateProcess( |
return return_object; |
} |
-template <typename ReplyType, typename MapObjectType, typename Method> |
-void IndexedDBDispatcherHost::SyncGetter( |
- IDMap<MapObjectType, IDMapOwnPointer>* map, int32 object_id, |
- ReplyType* reply, Method method) { |
- MapObjectType* object = GetOrTerminateProcess(map, object_id); |
- if (!object) |
- return; |
- |
- *reply = (object->*method)(); |
-} |
- |
template <typename ObjectType> |
void IndexedDBDispatcherHost::DestroyObject( |
IDMap<ObjectType, IDMapOwnPointer>* map, int32 object_id) { |
@@ -765,8 +755,8 @@ void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnClear( |
} |
void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnCreateIndex( |
- const IndexedDBHostMsg_ObjectStoreCreateIndex_Params& params, |
- int32* index_id, WebKit::WebExceptionCode* ec) { |
+ const IndexedDBHostMsg_ObjectStoreCreateIndex_Params& params, |
+ int32* index_id, WebKit::WebExceptionCode* ec) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED)); |
WebIDBObjectStore* idb_object_store = parent_->GetOrTerminateProcess( |
&map_, params.idb_object_store_id); |
@@ -885,7 +875,6 @@ bool IndexedDBDispatcherHost::CursorDispatcherHost::OnMessageReceived( |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::CursorDispatcherHost, |
message, *msg_is_ok) |
- IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorUpdate, OnUpdate) |
IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorAdvance, OnAdvance) |
IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorContinue, OnContinue) |
IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorPrefetch, OnPrefetch) |
@@ -931,23 +920,6 @@ void IndexedDBDispatcherHost::CursorDispatcherHost::OnValue( |
*script_value = SerializedScriptValue(idb_cursor->value()); |
} |
-void IndexedDBDispatcherHost::CursorDispatcherHost::OnUpdate( |
- int32 cursor_id, |
- int32 thread_id, |
- int32 response_id, |
- const SerializedScriptValue& value, |
- WebKit::WebExceptionCode* ec) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED)); |
- WebIDBCursor* idb_cursor = parent_->GetOrTerminateProcess(&map_, cursor_id); |
- if (!idb_cursor) |
- return; |
- |
- *ec = 0; |
- idb_cursor->update( |
- value, new IndexedDBCallbacks<WebIDBKey>(parent_, thread_id, response_id), |
- *ec); |
-} |
- |
void IndexedDBDispatcherHost::CursorDispatcherHost::OnAdvance( |
int32 cursor_id, |
int32 thread_id, |
@@ -1059,7 +1031,6 @@ bool IndexedDBDispatcherHost::TransactionDispatcherHost::OnMessageReceived( |
message, *msg_is_ok) |
IPC_MESSAGE_HANDLER(IndexedDBHostMsg_TransactionCommit, OnCommit) |
IPC_MESSAGE_HANDLER(IndexedDBHostMsg_TransactionAbort, OnAbort) |
- IPC_MESSAGE_HANDLER(IndexedDBHostMsg_TransactionMode, OnMode) |
IPC_MESSAGE_HANDLER(IndexedDBHostMsg_TransactionObjectStore, OnObjectStore) |
IPC_MESSAGE_HANDLER(IndexedDBHostMsg_TransactionDidCompleteTaskEvents, |
OnDidCompleteTaskEvents) |
@@ -1094,17 +1065,6 @@ void IndexedDBDispatcherHost::TransactionDispatcherHost::OnAbort( |
idb_transaction->abort(); |
} |
-void IndexedDBDispatcherHost::TransactionDispatcherHost::OnMode( |
- int32 transaction_id, |
- int* mode) { |
- WebIDBTransaction* idb_transaction = parent_->GetOrTerminateProcess( |
- &map_, transaction_id); |
- if (!idb_transaction) |
- return; |
- |
- *mode = idb_transaction->mode(); |
-} |
- |
void IndexedDBDispatcherHost::TransactionDispatcherHost::OnObjectStore( |
int32 transaction_id, const string16& name, int32* object_store_id, |
WebKit::WebExceptionCode* ec) { |