diff options
| author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 19:47:09 +0000 |
|---|---|---|
| committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 19:47:09 +0000 |
| commit | df8c170a84e18933d9e6410f5da8ac4840a2f068 (patch) | |
| tree | 7c9b1531725b748e054f3c0a33065186f69b1b8e /content/common | |
| parent | 94deba6328f812094e9f403d11e831f3edc427e1 (diff) | |
| download | chromium_src-df8c170a84e18933d9e6410f5da8ac4840a2f068.zip chromium_src-df8c170a84e18933d9e6410f5da8ac4840a2f068.tar.gz chromium_src-df8c170a84e18933d9e6410f5da8ac4840a2f068.tar.bz2 | |
IndexedDB: API rename to allow return type of keyPath accessors to change
To introduce a real KeyPath type, the return type of keyPath accessors
needs to change from a String to an IDBKeyPath. To do this requires
temporarily moving the methods aside. The WebKit API change (which must
land first) is at: https://bugs.webkit.org/show_bug.cgi?id=84208
R=darin@chromium.org,dgrogan@chromium.org
BUG=112308
Review URL: http://codereview.chromium.org/10041014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
4 files changed, 4 insertions, 4 deletions
diff --git a/content/common/indexed_db/proxy_webidbindex_impl.cc b/content/common/indexed_db/proxy_webidbindex_impl.cc index 9171e27..45ca84a 100644 --- a/content/common/indexed_db/proxy_webidbindex_impl.cc +++ b/content/common/indexed_db/proxy_webidbindex_impl.cc @@ -43,7 +43,7 @@ WebString RendererWebIDBIndexImpl::storeName() const { return result; } -WebString RendererWebIDBIndexImpl::keyPath() const { +WebString RendererWebIDBIndexImpl::keyPathString() const { NullableString16 result; IndexedDBDispatcher::Send( new IndexedDBHostMsg_IndexKeyPath(idb_index_id_, &result)); diff --git a/content/common/indexed_db/proxy_webidbindex_impl.h b/content/common/indexed_db/proxy_webidbindex_impl.h index a5e3dda..112eda0 100644 --- a/content/common/indexed_db/proxy_webidbindex_impl.h +++ b/content/common/indexed_db/proxy_webidbindex_impl.h @@ -18,7 +18,7 @@ class RendererWebIDBIndexImpl : public WebKit::WebIDBIndex { // WebKit::WebIDBIndex virtual WebKit::WebString name() const; virtual WebKit::WebString storeName() const; - virtual WebKit::WebString keyPath() const; + virtual WebKit::WebString keyPathString() const; virtual bool unique() const; virtual bool multiEntry() const; diff --git a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc index 4bcfddf..e417103 100644 --- a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc +++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc @@ -49,7 +49,7 @@ WebString RendererWebIDBObjectStoreImpl::name() const { return result; } -WebString RendererWebIDBObjectStoreImpl::keyPath() const { +WebString RendererWebIDBObjectStoreImpl::keyPathString() const { NullableString16 result; IndexedDBDispatcher::Send( new IndexedDBHostMsg_ObjectStoreKeyPath(idb_object_store_id_, &result)); diff --git a/content/common/indexed_db/proxy_webidbobjectstore_impl.h b/content/common/indexed_db/proxy_webidbobjectstore_impl.h index 610d698..bd96038 100644 --- a/content/common/indexed_db/proxy_webidbobjectstore_impl.h +++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.h @@ -25,7 +25,7 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore { // WebKit::WebIDBObjectStore virtual WebKit::WebString name() const; - virtual WebKit::WebString keyPath() const; + virtual WebKit::WebString keyPathString() const; virtual WebKit::WebDOMStringList indexNames() const; virtual void get(const WebKit::WebIDBKey& key, |