Make IndexedDBDispatcherHost be a message filter and move its messages into a...

chrome/renderer/renderer_webidbobjectstore_impl.cc

Index: chrome/renderer/renderer_webidbobjectstore_impl.cc
===================================================================
--- chrome/renderer/renderer_webidbobjectstore_impl.cc	(revision 69028)
+++ chrome/renderer/renderer_webidbobjectstore_impl.cc	(working copy)
@@ -4,9 +4,7 @@
 
 #include "chrome/renderer/renderer_webidbobjectstore_impl.h"
 
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
+#include "chrome/common/indexed_db_messages.h"
 #include "chrome/common/serialized_script_value.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/render_thread.h"
@@ -37,27 +35,28 @@
 
 RendererWebIDBObjectStoreImpl::~RendererWebIDBObjectStoreImpl() {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreDestroyed(idb_object_store_id_));
+      new IndexedDBHostMsg_ObjectStoreDestroyed(idb_object_store_id_));
 }
 
 WebString RendererWebIDBObjectStoreImpl::name() const {
   string16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreName(idb_object_store_id_, &result));
+      new IndexedDBHostMsg_ObjectStoreName(idb_object_store_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBObjectStoreImpl::keyPath() const {
   NullableString16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreKeyPath(idb_object_store_id_, &result));
+      new IndexedDBHostMsg_ObjectStoreKeyPath(idb_object_store_id_, &result));
   return result;
 }
 
 WebDOMStringList RendererWebIDBObjectStoreImpl::indexNames() const {
   std::vector<string16> result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreIndexNames(idb_object_store_id_, &result));
+      new IndexedDBHostMsg_ObjectStoreIndexNames(
+          idb_object_store_id_, &result));
   WebDOMStringList web_result;
   for (std::vector<string16>::const_iterator it = result.begin();
        it != result.end(); ++it) {
@@ -108,16 +107,16 @@
     bool unique,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
-  ViewHostMsg_IDBObjectStoreCreateIndex_Params params;
-  params.name_ = name;
-  params.key_path_ = key_path;
-  params.unique_ = unique;
-  params.transaction_id_ = IndexedDBDispatcher::TransactionId(transaction);
-  params.idb_object_store_id_ = idb_object_store_id_;
+  IndexedDBHostMsg_ObjectStoreCreateIndex_Params params;
+  params.name = name;
+  params.key_path = key_path;
+  params.unique = unique;
+  params.transaction_id = IndexedDBDispatcher::TransactionId(transaction);
+  params.idb_object_store_id = idb_object_store_id_;
 
   int32 index_id;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreCreateIndex(params, &index_id, &ec));
+      new IndexedDBHostMsg_ObjectStoreCreateIndex(params, &index_id, &ec));
   if (!index_id)
     return NULL;
   return new RendererWebIDBIndexImpl(index_id);
@@ -128,8 +127,8 @@
     WebExceptionCode& ec) {
   int32 idb_index_id;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreIndex(idb_object_store_id_, name,
-                                          &idb_index_id, &ec));
+      new IndexedDBHostMsg_ObjectStoreIndex(idb_object_store_id_, name,
+                                            &idb_index_id, &ec));
   if (!idb_index_id)
       return NULL;
   return new RendererWebIDBIndexImpl(idb_index_id);
@@ -140,7 +139,7 @@
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreDeleteIndex(
+      new IndexedDBHostMsg_ObjectStoreDeleteIndex(
           idb_object_store_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
 }
Property changes on: chrome\renderer\renderer_webidbobjectstore_impl.cc
___________________________________________________________________
Added: svn:eol-style
   + LF