diff options
| author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 20:18:27 +0000 |
|---|---|---|
| committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 20:18:27 +0000 |
| commit | 67a85dba124f3a447d69f9144ff45f3f465e1599 (patch) | |
| tree | 7b5af8c3e25a567d9f85911219f3ed82e422d6bd /content/ppapi_plugin | |
| parent | 5d606079f2f32139bf5116a21e78338314c2b918 (diff) | |
| download | chromium_src-67a85dba124f3a447d69f9144ff45f3f465e1599.zip chromium_src-67a85dba124f3a447d69f9144ff45f3f465e1599.tar.gz chromium_src-67a85dba124f3a447d69f9144ff45f3f465e1599.tar.bz2 | |
Use WebIDBKeyPath type in WebKit API, implement IndexedDBKeyPath type.
IndexedDB allows key paths to be strings or arrays of strings (or null,
for object stores). Implement the new WebKit API that uses a dedicated type
instead of strings, and implement appropriate IPC plumbing. This change is
dependent on: https://webkit.org/b/84631
R=darin@chromium.org,tkent@chromium.org,dgrogan@chromium.org,michaeln@chromium.org
BUG=112308
Review URL: http://codereview.chromium.org/10204003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc | 4 | ||||
| -rw-r--r-- | content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc index 6aec56c..56ee6a5 100644 --- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc +++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc @@ -241,7 +241,7 @@ int PpapiWebKitPlatformSupportImpl::databaseDeleteFile( void PpapiWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath( const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values, - const WebKit::WebString& keyPath, + const WebKit::WebIDBKeyPath& keyPath, WebKit::WebVector<WebKit::WebIDBKey>& keys) { NOTREACHED(); } @@ -250,7 +250,7 @@ WebKit::WebSerializedScriptValue PpapiWebKitPlatformSupportImpl::injectIDBKeyIntoSerializedValue( const WebKit::WebIDBKey& key, const WebKit::WebSerializedScriptValue& value, - const WebKit::WebString& keyPath) { + const WebKit::WebIDBKeyPath& keyPath) { NOTREACHED(); return WebKit::WebSerializedScriptValue(); } diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h index 93a349d..c40217a 100644 --- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h +++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -50,12 +50,12 @@ class PpapiWebKitPlatformSupportImpl : bool sync_dir); virtual void createIDBKeysFromSerializedValuesAndKeyPath( const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values, - const WebKit::WebString& keyPath, + const WebKit::WebIDBKeyPath& keyPath, WebKit::WebVector<WebKit::WebIDBKey>& keys); virtual WebKit::WebSerializedScriptValue injectIDBKeyIntoSerializedValue( const WebKit::WebIDBKey& key, const WebKit::WebSerializedScriptValue& value, - const WebKit::WebString& keyPath); + const WebKit::WebIDBKeyPath& keyPath); private: class SandboxSupport; |