diff options
| author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-05 14:58:18 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-05 14:58:18 +0000 |
| commit | f1b873f51bda1b262f00bc0fc98814c28cb2250c (patch) | |
| tree | c8762defdcf3f4d162274628a10858a5d22caef1 /webkit/tools | |
| parent | 2764785da139b0ac8a100da105c281b55489b3ae (diff) | |
| download | chromium_src-f1b873f51bda1b262f00bc0fc98814c28cb2250c.zip chromium_src-f1b873f51bda1b262f00bc0fc98814c28cb2250c.tar.gz chromium_src-f1b873f51bda1b262f00bc0fc98814c28cb2250c.tar.bz2 | |
Land http://codereview.chromium.org/3167045/show
Make Marcus's KeyPath code work with single process mode for IndexedDB.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3296008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h index f53db8c..459c253 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.h +++ b/webkit/tools/test_shell/test_shell_webkit_init.h @@ -8,6 +8,9 @@ #include "base/utf_string_conversions.h" #include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h" #include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebIDBKey.h" +#include "third_party/WebKit/WebKit/chromium/public/WebIDBKeyPath.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h" #include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h" #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webfileutilities_impl.h" @@ -119,6 +122,18 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl { return WebKit::WebIDBFactory::create(); } + virtual void createIDBKeysFromSerializedValuesAndKeyPath( + const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values, + const WebKit::WebString& keyPath, + WebKit::WebVector<WebKit::WebIDBKey>& keys_out) { + WebKit::WebVector<WebKit::WebIDBKey> keys(values.size()); + for (size_t i = 0; i < values.size(); ++i) { + keys[i] = WebKit::WebIDBKey::createFromValueAndKeyPath( + values[i], WebKit::WebIDBKeyPath::create(keyPath)); + } + keys_out.swap(keys); + } + #if defined(OS_WIN) void SetThemeEngine(WebKit::WebThemeEngine* engine) { active_theme_engine_ = engine ? engine : WebKitClientImpl::themeEngine(); |