diff options
Diffstat (limited to 'content/browser')
8 files changed, 92 insertions, 129 deletions
diff --git a/content/browser/in_process_webkit/indexed_db_callbacks.cc b/content/browser/in_process_webkit/indexed_db_callbacks.cc index 416f12a..0038ad3 100644 --- a/content/browser/in_process_webkit/indexed_db_callbacks.cc +++ b/content/browser/in_process_webkit/indexed_db_callbacks.cc @@ -40,8 +40,7 @@ void IndexedDBCallbacksBase::onBlocked(long long old_version) { ipc_thread_id_, ipc_callbacks_id_, old_version)); } -void IndexedDBCallbacksBase::onSuccess( - const WebVector<WebString>& value) { +void IndexedDBCallbacksBase::onSuccess(const WebVector<WebString>& value) { NOTREACHED(); } @@ -57,36 +56,34 @@ void IndexedDBCallbacksBase::onUpgradeNeeded(long long old_version, } void IndexedDBCallbacksBase::onSuccess(WebIDBCursorImpl* idb_object, - const WebKit::WebIDBKey& key, - const WebKit::WebIDBKey& primaryKey, + const IndexedDBKey& key, + const IndexedDBKey& primaryKey, const WebData& value) { NOTREACHED(); } -void IndexedDBCallbacksBase::onSuccess(const WebKit::WebIDBKey& key, - const WebKit::WebIDBKey& primaryKey, +void IndexedDBCallbacksBase::onSuccess(const IndexedDBKey& key, + const IndexedDBKey& primaryKey, const WebData& value) { NOTREACHED(); } -void IndexedDBCallbacksBase::onSuccess(const WebData& value) { - NOTREACHED(); -} +void IndexedDBCallbacksBase::onSuccess(const WebData& value) { NOTREACHED(); } void IndexedDBCallbacksBase::onSuccessWithPrefetch( - const WebVector<WebKit::WebIDBKey>& keys, - const WebVector<WebKit::WebIDBKey>& primaryKeys, - const WebVector<WebData>& values) { + const std::vector<IndexedDBKey>& keys, + const std::vector<IndexedDBKey>& primaryKeys, + const std::vector<std::vector<char> >& values) { NOTREACHED(); } -void IndexedDBCallbacksBase::onSuccess(const WebKit::WebIDBKey& value) { +void IndexedDBCallbacksBase::onSuccess(const IndexedDBKey& value) { NOTREACHED(); } void IndexedDBCallbacksBase::onSuccess(const WebData& value, - const WebKit::WebIDBKey& key, - const WebKit::WebIDBKeyPath& keyPath) { + const IndexedDBKey& key, + const IndexedDBKeyPath& keyPath) { NOTREACHED(); } @@ -149,8 +146,8 @@ void IndexedDBCallbacksDatabase::onUpgradeNeeded( void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess( WebIDBCursorImpl* idb_cursor, - const WebKit::WebIDBKey& key, - const WebKit::WebIDBKey& primaryKey, + const IndexedDBKey& key, + const IndexedDBKey& primaryKey, const WebData& value) { int32 ipc_object_id = dispatcher_host()->Add(idb_cursor); IndexedDBMsg_CallbacksSuccessIDBCursor_Params params; @@ -163,16 +160,15 @@ void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess( dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessIDBCursor(params)); } -void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess( - const WebData& webValue) { +void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess(const WebData& webValue) { std::vector<char> value(webValue.data(), webValue.data() + webValue.size()); dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessValue( ipc_thread_id(), ipc_callbacks_id(), value)); } void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess( - const WebKit::WebIDBKey& key, - const WebKit::WebIDBKey& primaryKey, + const IndexedDBKey& key, + const IndexedDBKey& primaryKey, const WebData& value) { DCHECK_NE(ipc_cursor_id_, -1); WebIDBCursorImpl* idb_cursor = @@ -193,20 +189,17 @@ void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess( } void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccessWithPrefetch( - const WebVector<WebKit::WebIDBKey>& keys, - const WebVector<WebKit::WebIDBKey>& primaryKeys, - const WebVector<WebData>& values) { + const std::vector<IndexedDBKey>& keys, + const std::vector<IndexedDBKey>& primaryKeys, + const std::vector<std::vector<char> >& values) { DCHECK_NE(ipc_cursor_id_, -1); std::vector<IndexedDBKey> msgKeys; std::vector<IndexedDBKey> msgPrimaryKeys; - std::vector<std::vector<char> > msgValues; for (size_t i = 0; i < keys.size(); ++i) { - msgKeys.push_back(IndexedDBKey(keys[i])); - msgPrimaryKeys.push_back(IndexedDBKey(primaryKeys[i])); - msgValues.push_back(std::vector<char>(values[i].data(), - values[i].data() + values[i].size())); + msgKeys.push_back(keys[i]); + msgPrimaryKeys.push_back(primaryKeys[i]); } IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params params; @@ -215,13 +208,12 @@ void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccessWithPrefetch( params.ipc_cursor_id = ipc_cursor_id_; params.keys = msgKeys; params.primary_keys = msgPrimaryKeys; - params.values = msgValues; + params.values = values; dispatcher_host()->Send( new IndexedDBMsg_CallbacksSuccessCursorPrefetch(params)); } -void IndexedDBCallbacks<WebKit::WebIDBKey>::onSuccess( - const WebKit::WebIDBKey& value) { +void IndexedDBCallbacks<IndexedDBKey>::onSuccess(const IndexedDBKey& value) { dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessIndexedDBKey( ipc_thread_id(), ipc_callbacks_id(), IndexedDBKey(value))); } @@ -237,18 +229,16 @@ void IndexedDBCallbacks<WebVector<WebString> >::onSuccess( ipc_thread_id(), ipc_callbacks_id(), list)); } -void IndexedDBCallbacks<WebData>::onSuccess( - const WebData& value) { +void IndexedDBCallbacks<WebData>::onSuccess(const WebData& value) { dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessValue( ipc_thread_id(), ipc_callbacks_id(), std::vector<char>(value.data(), value.data() + value.size()))); } -void IndexedDBCallbacks<WebData>::onSuccess( - const WebData& value, - const WebKit::WebIDBKey& primaryKey, - const WebKit::WebIDBKeyPath& keyPath) { +void IndexedDBCallbacks<WebData>::onSuccess(const WebData& value, + const IndexedDBKey& primaryKey, + const IndexedDBKeyPath& keyPath) { dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessValueWithKey( ipc_thread_id(), ipc_callbacks_id(), @@ -267,8 +257,7 @@ void IndexedDBCallbacks<WebData>::onSuccess() { ipc_thread_id(), ipc_callbacks_id())); } -void IndexedDBCallbacks<WebData>::onSuccess( - const WebKit::WebIDBKey& value) { +void IndexedDBCallbacks<WebData>::onSuccess(const IndexedDBKey& value) { dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessIndexedDBKey( ipc_thread_id(), ipc_callbacks_id(), IndexedDBKey(value))); } diff --git a/content/browser/in_process_webkit/indexed_db_callbacks.h b/content/browser/in_process_webkit/indexed_db_callbacks.h index 022615a..570b4f8 100644 --- a/content/browser/in_process_webkit/indexed_db_callbacks.h +++ b/content/browser/in_process_webkit/indexed_db_callbacks.h @@ -33,21 +33,21 @@ class IndexedDBCallbacksBase { WebIDBDatabaseImpl* database, const WebKit::WebIDBMetadata&); virtual void onSuccess(WebIDBCursorImpl* idb_object, - const WebKit::WebIDBKey& key, - const WebKit::WebIDBKey& primaryKey, + const IndexedDBKey& key, + const IndexedDBKey& primaryKey, const WebKit::WebData& value); - virtual void onSuccess(const WebKit::WebIDBKey& key, - const WebKit::WebIDBKey& primaryKey, + virtual void onSuccess(const IndexedDBKey& key, + const IndexedDBKey& primaryKey, const WebKit::WebData& value); virtual void onSuccess(const WebKit::WebData& value); virtual void onSuccessWithPrefetch( - const WebKit::WebVector<WebKit::WebIDBKey>& keys, - const WebKit::WebVector<WebKit::WebIDBKey>& primaryKeys, - const WebKit::WebVector<WebKit::WebData>& values); - virtual void onSuccess(const WebKit::WebIDBKey& value); + const std::vector<IndexedDBKey>& keys, + const std::vector<IndexedDBKey>& primaryKeys, + const std::vector<std::vector<char> >& values); + virtual void onSuccess(const IndexedDBKey& value); virtual void onSuccess(const WebKit::WebData& value, - const WebKit::WebIDBKey& key, - const WebKit::WebIDBKeyPath& keyPath); + const IndexedDBKey& key, + const IndexedDBKeyPath& keyPath); virtual void onSuccess(long long value); virtual void onSuccess(); @@ -120,17 +120,17 @@ class IndexedDBCallbacks<WebIDBCursorImpl> : public IndexedDBCallbacksBase { ipc_cursor_id_(ipc_cursor_id) {} virtual void onSuccess(WebIDBCursorImpl* idb_object, - const WebKit::WebIDBKey& key, - const WebKit::WebIDBKey& primaryKey, + const IndexedDBKey& key, + const IndexedDBKey& primaryKey, const WebKit::WebData& value); - virtual void onSuccess(const WebKit::WebIDBKey& key, - const WebKit::WebIDBKey& primaryKey, + virtual void onSuccess(const IndexedDBKey& key, + const IndexedDBKey& primaryKey, const WebKit::WebData& value); virtual void onSuccess(const WebKit::WebData& value); virtual void onSuccessWithPrefetch( - const WebKit::WebVector<WebKit::WebIDBKey>& keys, - const WebKit::WebVector<WebKit::WebIDBKey>& primaryKeys, - const WebKit::WebVector<WebKit::WebData>& values); + const std::vector<IndexedDBKey>& keys, + const std::vector<IndexedDBKey>& primaryKeys, + const std::vector<std::vector<char> >& values); private: // The id of the cursor this callback concerns, or -1 if the cursor @@ -144,7 +144,7 @@ class IndexedDBCallbacks<WebIDBCursorImpl> : public IndexedDBCallbacksBase { // implements. Thus we pass a const ___& version and thus we need this // specialization. template <> -class IndexedDBCallbacks<WebKit::WebIDBKey> : public IndexedDBCallbacksBase { +class IndexedDBCallbacks<IndexedDBKey> : public IndexedDBCallbacksBase { public: IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host, int32 ipc_thread_id, @@ -153,7 +153,7 @@ class IndexedDBCallbacks<WebKit::WebIDBKey> : public IndexedDBCallbacksBase { ipc_thread_id, ipc_callbacks_id) {} - virtual void onSuccess(const WebKit::WebIDBKey& value); + virtual void onSuccess(const IndexedDBKey& value); private: DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks); @@ -194,11 +194,11 @@ class IndexedDBCallbacks<WebKit::WebData> : public IndexedDBCallbacksBase { virtual void onSuccess(const WebKit::WebData& value); virtual void onSuccess(const WebKit::WebData& value, - const WebKit::WebIDBKey& key, - const WebKit::WebIDBKeyPath& keyPath); + const IndexedDBKey& key, + const IndexedDBKeyPath& keyPath); virtual void onSuccess(long long value); virtual void onSuccess(); - virtual void onSuccess(const WebKit::WebIDBKey& value); + virtual void onSuccess(const IndexedDBKey& value); private: DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks); 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 491d896..ee3259a 100644 --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc @@ -509,7 +509,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnPut( if (!database) return; scoped_ptr<IndexedDBCallbacksBase> callbacks( - new IndexedDBCallbacks<WebIDBKey>( + new IndexedDBCallbacks<IndexedDBKey>( parent_, params.ipc_thread_id, params.ipc_callbacks_id)); // Be careful with empty vectors. WebData value; diff --git a/content/browser/indexed_db/indexed_db_callbacks_wrapper.cc b/content/browser/indexed_db/indexed_db_callbacks_wrapper.cc index b233876..3c2fd7f 100644 --- a/content/browser/indexed_db/indexed_db_callbacks_wrapper.cc +++ b/content/browser/indexed_db/indexed_db_callbacks_wrapper.cc @@ -51,13 +51,13 @@ void IndexedDBCallbacksWrapper::OnSuccess(scoped_refptr<IndexedDBCursor> cursor, if (value && value->size()) web_value.assign(&value->front(), value->size()); callbacks_->onSuccess( - new WebIDBCursorImpl(cursor), WebIDBKey(key), primary_key, web_value); + new WebIDBCursorImpl(cursor), key, primary_key, web_value); callbacks_.reset(); } void IndexedDBCallbacksWrapper::OnSuccess(const IndexedDBKey& key) { DCHECK(callbacks_); - callbacks_->onSuccess(WebIDBKey(key)); + callbacks_->onSuccess(key); callbacks_.reset(); } @@ -78,7 +78,7 @@ void IndexedDBCallbacksWrapper::OnSuccess(std::vector<char>* value, if (value && value->size()) web_value.assign(&value->front(), value->size()); DCHECK(callbacks_); - callbacks_->onSuccess(web_value, WebIDBKey(key), key_path); + callbacks_->onSuccess(web_value, key, key_path); callbacks_.reset(); } @@ -112,18 +112,8 @@ void IndexedDBCallbacksWrapper::OnSuccessWithPrefetch( DCHECK_EQ(keys.size(), primary_keys.size()); DCHECK_EQ(keys.size(), values.size()); - std::vector<WebIDBKey> web_keys(keys.size()); - std::vector<WebIDBKey> web_primary_keys(primary_keys.size()); - std::vector<WebData> web_values(values.size()); - for (size_t i = 0; i < keys.size(); ++i) { - web_keys[i] = keys[i]; - web_primary_keys[i] = primary_keys[i]; - if (values[i].size()) - web_values[i].assign(&values[i].front(), values[i].size()); - } - DCHECK(callbacks_); - callbacks_->onSuccessWithPrefetch(web_keys, web_primary_keys, web_values); + callbacks_->onSuccessWithPrefetch(keys, primary_keys, values); callbacks_.reset(); } diff --git a/content/browser/indexed_db/webidbcursor_impl.cc b/content/browser/indexed_db/webidbcursor_impl.cc index 7d8ba02..abb6f1c 100644 --- a/content/browser/indexed_db/webidbcursor_impl.cc +++ b/content/browser/indexed_db/webidbcursor_impl.cc @@ -7,7 +7,6 @@ #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h" #include "content/browser/indexed_db/indexed_db_cursor.h" #include "content/common/indexed_db/indexed_db_key.h" -#include "third_party/WebKit/public/platform/WebIDBKey.h" namespace content { @@ -23,7 +22,7 @@ void WebIDBCursorImpl::advance(unsigned long count, IndexedDBCallbacksWrapper::Create(callbacks)); } -void WebIDBCursorImpl::continueFunction(const WebKit::WebIDBKey& key, +void WebIDBCursorImpl::continueFunction(const IndexedDBKey& key, IndexedDBCallbacksBase* callbacks) { idb_cursor_backend_->ContinueFunction( make_scoped_ptr(new IndexedDBKey(key)), diff --git a/content/browser/indexed_db/webidbcursor_impl.h b/content/browser/indexed_db/webidbcursor_impl.h index 4a04a05..d710618 100644 --- a/content/browser/indexed_db/webidbcursor_impl.h +++ b/content/browser/indexed_db/webidbcursor_impl.h @@ -7,13 +7,10 @@ #include "base/memory/ref_counted.h" -namespace WebKit { -class WebIDBKey; -} - namespace content { class IndexedDBCursor; class IndexedDBCallbacksBase; +class IndexedDBKey; class WebIDBCursorImpl { public: @@ -21,7 +18,7 @@ class WebIDBCursorImpl { virtual ~WebIDBCursorImpl(); virtual void advance(unsigned long, IndexedDBCallbacksBase* callbacks); - virtual void continueFunction(const WebKit::WebIDBKey& key, + virtual void continueFunction(const IndexedDBKey& key, IndexedDBCallbacksBase* callbacks); virtual void prefetchContinue(int number_to_fetch, IndexedDBCallbacksBase* callbacks); diff --git a/content/browser/indexed_db/webidbdatabase_impl.cc b/content/browser/indexed_db/webidbdatabase_impl.cc index fe0bc0f..86c78e9 100644 --- a/content/browser/indexed_db/webidbdatabase_impl.cc +++ b/content/browser/indexed_db/webidbdatabase_impl.cc @@ -15,15 +15,10 @@ #include "content/common/indexed_db/indexed_db_key_range.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebIDBDatabaseError.h" -#include "third_party/WebKit/public/platform/WebIDBKey.h" -#include "third_party/WebKit/public/platform/WebIDBKeyRange.h" #include "third_party/WebKit/public/platform/WebIDBMetadata.h" using WebKit::WebString; -using WebKit::WebIDBKey; using WebKit::WebData; -using WebKit::WebIDBKeyPath; -using WebKit::WebIDBKeyRange; using WebKit::WebVector; using WebKit::WebIDBDatabaseError; @@ -40,7 +35,7 @@ WebIDBDatabaseImpl::~WebIDBDatabaseImpl() {} void WebIDBDatabaseImpl::createObjectStore(long long transaction_id, long long object_store_id, const WebString& name, - const WebIDBKeyPath& key_path, + const IndexedDBKeyPath& key_path, bool auto_increment) { database_backend_->CreateObjectStore(transaction_id, object_store_id, @@ -104,7 +99,7 @@ void WebIDBDatabaseImpl::commit(long long transaction_id) { void WebIDBDatabaseImpl::openCursor(long long transaction_id, long long object_store_id, long long index_id, - const WebIDBKeyRange& key_range, + const IndexedDBKeyRange& key_range, unsigned short direction, bool key_only, WebKit::WebIDBDatabase::TaskType task_type, @@ -124,7 +119,7 @@ void WebIDBDatabaseImpl::openCursor(long long transaction_id, void WebIDBDatabaseImpl::count(long long transaction_id, long long object_store_id, long long index_id, - const WebIDBKeyRange& key_range, + const IndexedDBKeyRange& key_range, IndexedDBCallbacksBase* callbacks) { if (database_backend_) database_backend_->Count(transaction_id, @@ -137,7 +132,7 @@ void WebIDBDatabaseImpl::count(long long transaction_id, void WebIDBDatabaseImpl::get(long long transaction_id, long long object_store_id, long long index_id, - const WebIDBKeyRange& key_range, + const IndexedDBKeyRange& key_range, bool key_only, IndexedDBCallbacksBase* callbacks) { if (database_backend_) @@ -149,28 +144,22 @@ void WebIDBDatabaseImpl::get(long long transaction_id, IndexedDBCallbacksWrapper::Create(callbacks)); } -void WebIDBDatabaseImpl::put( - long long transaction_id, - long long object_store_id, - const WebData& value, - const WebIDBKey& key, - WebKit::WebIDBDatabase::PutMode put_mode, - IndexedDBCallbacksBase* callbacks, - const WebVector<long long>& web_index_ids, - const WebVector<WebKit::WebIDBDatabase::WebIndexKeys>& web_index_keys) { +void WebIDBDatabaseImpl::put(long long transaction_id, + long long object_store_id, + const WebData& value, + const IndexedDBKey& key, + WebKit::WebIDBDatabase::PutMode put_mode, + IndexedDBCallbacksBase* callbacks, + const WebVector<long long>& web_index_ids, + const std::vector<IndexKeys>& index_keys) { if (!database_backend_) return; - DCHECK_EQ(web_index_ids.size(), web_index_keys.size()); + DCHECK_EQ(web_index_ids.size(), index_keys.size()); std::vector<int64> index_ids(web_index_ids.size()); - std::vector<IndexedDBDatabase::IndexKeys> index_keys(web_index_keys.size()); for (size_t i = 0; i < web_index_ids.size(); ++i) { index_ids[i] = web_index_ids[i]; - IndexedDBKey::KeyArray index_key_list; - for (size_t j = 0; j < web_index_keys[i].size(); ++j) - index_key_list.push_back(IndexedDBKey(web_index_keys[i][j])); - index_keys[i] = index_key_list; } std::vector<char> value_buffer(value.data(), value.data() + value.size()); @@ -187,9 +176,9 @@ void WebIDBDatabaseImpl::put( void WebIDBDatabaseImpl::setIndexKeys( long long transaction_id, long long object_store_id, - const WebIDBKey& primary_key, + const IndexedDBKey& primary_key, const WebVector<long long>& web_index_ids, - const WebVector<WebKit::WebIDBDatabase::WebIndexKeys>& web_index_keys) { + const std::vector<IndexKeys>& web_index_keys) { if (!database_backend_) return; @@ -201,7 +190,7 @@ void WebIDBDatabaseImpl::setIndexKeys( index_ids[i] = web_index_ids[i]; IndexedDBKey::KeyArray index_key_list; for (size_t j = 0; j < web_index_keys[i].size(); ++j) - index_key_list.push_back(IndexedDBKey(web_index_keys[i][j])); + index_key_list.push_back(web_index_keys[i][j]); index_keys[i] = index_key_list; } database_backend_->SetIndexKeys( @@ -228,7 +217,7 @@ void WebIDBDatabaseImpl::setIndexesReady( void WebIDBDatabaseImpl::deleteRange(long long transaction_id, long long object_store_id, - const WebIDBKeyRange& key_range, + const IndexedDBKeyRange& key_range, IndexedDBCallbacksBase* callbacks) { if (database_backend_) database_backend_->DeleteRange( @@ -251,7 +240,7 @@ void WebIDBDatabaseImpl::createIndex(long long transaction_id, long long object_store_id, long long index_id, const WebString& name, - const WebIDBKeyPath& key_path, + const IndexedDBKeyPath& key_path, bool unique, bool multi_entry) { if (database_backend_) diff --git a/content/browser/indexed_db/webidbdatabase_impl.h b/content/browser/indexed_db/webidbdatabase_impl.h index 6e42310..b5592bc 100644 --- a/content/browser/indexed_db/webidbdatabase_impl.h +++ b/content/browser/indexed_db/webidbdatabase_impl.h @@ -28,10 +28,12 @@ class CONTENT_EXPORT WebIDBDatabaseImpl { scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks); virtual ~WebIDBDatabaseImpl(); + typedef std::vector<IndexedDBKey> IndexKeys; + virtual void createObjectStore(long long transaction_id, long long object_store_id, const WebKit::WebString& name, - const WebKit::WebIDBKeyPath& key_path, + const IndexedDBKeyPath& key_path, bool auto_increment); virtual void deleteObjectStore(long long object_store_id, long long transaction_id); @@ -49,32 +51,29 @@ class CONTENT_EXPORT WebIDBDatabaseImpl { virtual void get(long long transaction_id, long long object_store_id, long long index_id, - const WebKit::WebIDBKeyRange& range, + const IndexedDBKeyRange& range, bool key_only, IndexedDBCallbacksBase* callbacks); virtual void put(long long transaction_id, long long object_store_id, const WebKit::WebData& value, - const WebKit::WebIDBKey& key, + const IndexedDBKey& key, WebKit::WebIDBDatabase::PutMode mode, IndexedDBCallbacksBase* callbacks, const WebKit::WebVector<long long>& index_ids, - const WebKit::WebVector< - WebKit::WebIDBDatabase::WebIndexKeys>& index_keys); - virtual void setIndexKeys( - long long transaction_id, - long long object_store_id, - const WebKit::WebIDBKey& key, - const WebKit::WebVector<long long>& index_ids, - const WebKit::WebVector<WebKit::WebIDBDatabase::WebIndexKeys>& - index_keys); + const std::vector<IndexKeys>& index_keys); + virtual void setIndexKeys(long long transaction_id, + long long object_store_id, + const IndexedDBKey& key, + const WebKit::WebVector<long long>& index_ids, + const std::vector<IndexKeys>& index_keys); virtual void setIndexesReady(long long transaction_id, long long object_store_id, const WebKit::WebVector<long long>& index_ids); virtual void openCursor(long long transaction_id, long long object_store_id, long long index_id, - const WebKit::WebIDBKeyRange& range, + const IndexedDBKeyRange& range, unsigned short direction, bool key_only, WebKit::WebIDBDatabase::TaskType task_type, @@ -82,11 +81,11 @@ class CONTENT_EXPORT WebIDBDatabaseImpl { virtual void count(long long transaction_id, long long object_store_id, long long index_id, - const WebKit::WebIDBKeyRange& range, + const IndexedDBKeyRange& range, IndexedDBCallbacksBase* callbacks); virtual void deleteRange(long long transaction_id, long long object_store_id, - const WebKit::WebIDBKeyRange& range, + const IndexedDBKeyRange& range, IndexedDBCallbacksBase* callbacks); virtual void clear(long long transaction_id, long long object_store_id, @@ -96,7 +95,7 @@ class CONTENT_EXPORT WebIDBDatabaseImpl { long long object_store_id, long long index_id, const WebKit::WebString& name, - const WebKit::WebIDBKeyPath& key_path, + const IndexedDBKeyPath& key_path, bool unique, bool multi_entry); virtual void deleteIndex(long long transaction_id, |