summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc10
-rw-r--r--chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h1
-rw-r--r--chrome/common/render_messages_internal.h5
-rw-r--r--chrome/renderer/renderer_webidbdatabase_impl.cc7
-rw-r--r--chrome/renderer/renderer_webidbdatabase_impl.h1
-rw-r--r--chrome/test/data/indexeddb/cursor_test.js2
-rw-r--r--chrome/test/data/indexeddb/database_test.js2
-rw-r--r--chrome/test/data/indexeddb/index_test.js2
-rw-r--r--chrome/test/data/indexeddb/key_path_test.js2
-rw-r--r--chrome/test/data/indexeddb/object_store_test.js2
-rw-r--r--chrome/test/data/indexeddb/transaction_get_test.js2
-rw-r--r--chrome/test/data/indexeddb/transaction_run_forever.js2
-rw-r--r--chrome/test/data/indexeddb/transaction_test.js2
-rw-r--r--tools/page_cycler/indexed_db/basic_insert/index.html2
14 files changed, 9 insertions, 33 deletions
diff --git a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 1586552..d52fc35 100644
--- a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -130,7 +130,6 @@ bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message) {
case ViewHostMsg_IDBCursorDestroyed::ID:
case ViewHostMsg_IDBFactoryOpen::ID:
case ViewHostMsg_IDBDatabaseName::ID:
- case ViewHostMsg_IDBDatabaseDescription::ID:
case ViewHostMsg_IDBDatabaseVersion::ID:
case ViewHostMsg_IDBDatabaseObjectStoreNames::ID:
case ViewHostMsg_IDBDatabaseCreateObjectStore::ID:
@@ -362,8 +361,6 @@ bool IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMessageReceived(
IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::DatabaseDispatcherHost,
message, *msg_is_ok)
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBDatabaseName, OnName)
- IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBDatabaseDescription,
- OnDescription)
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBDatabaseVersion, OnVersion)
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBDatabaseObjectStoreNames,
OnObjectStoreNames)
@@ -395,13 +392,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnName(
&map_, object_id, reply_msg, &WebIDBDatabase::name);
}
-// TODO(hans): Delete this?
-void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnDescription(
- int32 object_id, IPC::Message* reply_msg) {
- parent_->SyncGetter<string16, ViewHostMsg_IDBDatabaseDescription>(
- &map_, object_id, reply_msg, &WebIDBDatabase::description);
-}
-
void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnVersion(
int32 object_id, IPC::Message* reply_msg) {
parent_->SyncGetter<string16, ViewHostMsg_IDBDatabaseVersion>(
diff --git a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
index b065c72..9f6fd0a 100644
--- a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
+++ b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
@@ -99,7 +99,6 @@ class IndexedDBDispatcherHost
void Send(IPC::Message* message);
void OnName(int32 idb_database_id, IPC::Message* reply_msg);
- void OnDescription(int32 idb_database_id, IPC::Message* reply_msg);
void OnVersion(int32 idb_database_id, IPC::Message* reply_msg);
void OnObjectStoreNames(int32 idb_database_id, IPC::Message* reply_msg);
void OnCreateObjectStore(
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 4f65f25..53fc70b 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -2473,11 +2473,6 @@ IPC_BEGIN_MESSAGES(ViewHost)
int32, /* idb_database_id */
string16 /* name */)
- // WebIDBDatabase::description() message.
- IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_IDBDatabaseDescription,
- int32, /* idb_database_id */
- string16 /* description */)
-
// WebIDBDatabase::version() message.
IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_IDBDatabaseVersion,
int32, /* idb_database_id */
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.cc b/chrome/renderer/renderer_webidbdatabase_impl.cc
index 2cdfbbb..09dec11 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.cc
+++ b/chrome/renderer/renderer_webidbdatabase_impl.cc
@@ -38,13 +38,6 @@ WebString RendererWebIDBDatabaseImpl::name() const {
return result;
}
-WebString RendererWebIDBDatabaseImpl::description() const {
- string16 result;
- RenderThread::current()->Send(
- new ViewHostMsg_IDBDatabaseDescription(idb_database_id_, &result));
- return result;
-}
-
WebString RendererWebIDBDatabaseImpl::version() const {
string16 result;
RenderThread::current()->Send(
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.h b/chrome/renderer/renderer_webidbdatabase_impl.h
index 066f5a1..a88fb41 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.h
+++ b/chrome/renderer/renderer_webidbdatabase_impl.h
@@ -24,7 +24,6 @@ class RendererWebIDBDatabaseImpl : public WebKit::WebIDBDatabase {
// WebKit::WebIDBDatabase
virtual WebKit::WebString name() const;
- virtual WebKit::WebString description() const;
virtual WebKit::WebString version() const;
virtual WebKit::WebDOMStringList objectStoreNames() const;
virtual WebKit::WebIDBObjectStore* createObjectStore(
diff --git a/chrome/test/data/indexeddb/cursor_test.js b/chrome/test/data/indexeddb/cursor_test.js
index 321f434..1c6b40c 100644
--- a/chrome/test/data/indexeddb/cursor_test.js
+++ b/chrome/test/data/indexeddb/cursor_test.js
@@ -71,7 +71,7 @@ function setVersion()
function test()
{
debug('Connecting to indexedDB');
- var result = webkitIndexedDB.open('name', 'description');
+ var result = webkitIndexedDB.open('name');
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/database_test.js b/chrome/test/data/indexeddb/database_test.js
index c80edf4..ca6d1fd 100644
--- a/chrome/test/data/indexeddb/database_test.js
+++ b/chrome/test/data/indexeddb/database_test.js
@@ -41,7 +41,7 @@ function test()
}
debug('Connecting to indexedDB');
- var result = indexedDB.open('name', 'description');
+ var result = indexedDB.open('name');
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/index_test.js b/chrome/test/data/indexeddb/index_test.js
index 9522b2e..56f3866 100644
--- a/chrome/test/data/indexeddb/index_test.js
+++ b/chrome/test/data/indexeddb/index_test.js
@@ -154,7 +154,7 @@ function test()
}
debug('Connecting to indexedDB');
- var result = indexedDB.open('name', 'description');
+ var result = indexedDB.open('name');
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/key_path_test.js b/chrome/test/data/indexeddb/key_path_test.js
index 0acb552..b6825e6 100644
--- a/chrome/test/data/indexeddb/key_path_test.js
+++ b/chrome/test/data/indexeddb/key_path_test.js
@@ -62,7 +62,7 @@ function test()
{
debug("Test IndexedDB's KeyPath.");
debug("Opening IndexedDB");
- result = webkitIndexedDB.open('name', 'description');
+ result = webkitIndexedDB.open('name');
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/object_store_test.js b/chrome/test/data/indexeddb/object_store_test.js
index 685e536..c4a1157 100644
--- a/chrome/test/data/indexeddb/object_store_test.js
+++ b/chrome/test/data/indexeddb/object_store_test.js
@@ -80,7 +80,7 @@ function setVersion()
function test()
{
debug('Connecting to indexedDB');
- var result = webkitIndexedDB.open('name', 'description');
+ var result = webkitIndexedDB.open('name');
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/transaction_get_test.js b/chrome/test/data/indexeddb/transaction_get_test.js
index 9c626c0..fbce814 100644
--- a/chrome/test/data/indexeddb/transaction_get_test.js
+++ b/chrome/test/data/indexeddb/transaction_get_test.js
@@ -60,7 +60,7 @@ function setVersion()
function test()
{
- result = webkitIndexedDB.open('name', 'description');
+ result = webkitIndexedDB.open('name');
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/transaction_run_forever.js b/chrome/test/data/indexeddb/transaction_run_forever.js
index 2a6ba3e..417323f 100644
--- a/chrome/test/data/indexeddb/transaction_run_forever.js
+++ b/chrome/test/data/indexeddb/transaction_run_forever.js
@@ -73,7 +73,7 @@ function test()
}
debug('Connecting to indexedDB.');
- var result = indexedDB.open('name', 'description');
+ var result = indexedDB.open('name');
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/transaction_test.js b/chrome/test/data/indexeddb/transaction_test.js
index eac97b2..0b82e01 100644
--- a/chrome/test/data/indexeddb/transaction_test.js
+++ b/chrome/test/data/indexeddb/transaction_test.js
@@ -86,7 +86,7 @@ function test()
}
debug('Connecting to indexedDB.');
- var result = indexedDB.open('name', 'description');
+ var result = indexedDB.open('name');
result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/tools/page_cycler/indexed_db/basic_insert/index.html b/tools/page_cycler/indexed_db/basic_insert/index.html
index f9361e7..8f13e58 100644
--- a/tools/page_cycler/indexed_db/basic_insert/index.html
+++ b/tools/page_cycler/indexed_db/basic_insert/index.html
@@ -19,7 +19,7 @@
if (!setup())
testComplete(SETUP_FAILED);
- var request = indexedDB.open('idb_basic_insert', '');
+ var request = indexedDB.open('idb_basic_insert');
request.onsuccess = onOpen;
request.onerror = error;
}
generated by cgit v1.1 at 2025-02-01 00:27:28 +0000