summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorjsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 19:47:09 +0000
committerjsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 19:47:09 +0000
commitdf8c170a84e18933d9e6410f5da8ac4840a2f068 (patch)
tree7c9b1531725b748e054f3c0a33065186f69b1b8e /content/browser
parent94deba6328f812094e9f403d11e831f3edc427e1 (diff)
downloadchromium_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/browser')
-rw-r--r--content/browser/in_process_webkit/indexed_db_dispatcher_host.cc4
1 files changed, 2 insertions, 2 deletions
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 4c5bee6..74eaacc 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -535,7 +535,7 @@ void IndexedDBDispatcherHost::IndexDispatcherHost::OnStoreName(
void IndexedDBDispatcherHost::IndexDispatcherHost::OnKeyPath(
int32 object_id, NullableString16* key_path) {
parent_->SyncGetter<NullableString16>(
- &map_, object_id, key_path, &WebIDBIndex::keyPath);
+ &map_, object_id, key_path, &WebIDBIndex::keyPathString);
}
void IndexedDBDispatcherHost::IndexDispatcherHost::OnUnique(
@@ -757,7 +757,7 @@ void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnName(
void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnKeyPath(
int32 object_id, NullableString16* keyPath) {
parent_->SyncGetter<NullableString16>(
- &map_, object_id, keyPath, &WebIDBObjectStore::keyPath);
+ &map_, object_id, keyPath, &WebIDBObjectStore::keyPathString);
}
void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnIndexNames(