Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9896)

Unified Diff: content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc

Issue 10204003: Use WebIDBKeyPath type in WebKit API, implement IndexedDBKeyPath type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move IndexedDBKeyPath to content namespace, formatting nits. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
diff --git a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
index fb50ee3a62bcd524cb7df568523e35b79338642c..e62f3d636a94fee4a223784394d7800e1f392d80 100644
--- a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
+++ b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
@@ -9,6 +9,7 @@
#include "content/browser/gpu/browser_gpu_channel_host_factory.h"
#include "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
#include "content/common/indexed_db/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_key_path.h"
#include "content/public/common/serialized_script_value.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
@@ -130,7 +131,7 @@ int BrowserWebKitPlatformSupportImpl::databaseDeleteFile(
void
BrowserWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath(
const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values,
- const WebKit::WebString& keyPath,
+ const WebKit::WebIDBKeyPath& keyPath,
WebKit::WebVector<WebKit::WebIDBKey>& keys) {
std::vector<content::SerializedScriptValue> std_values;
@@ -141,8 +142,8 @@ BrowserWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath(
std::vector<IndexedDBKey> std_keys;
IndexedDBKeyUtilityClient::
- CreateIDBKeysFromSerializedValuesAndKeyPath(std_values, keyPath,
- &std_keys);
+ CreateIDBKeysFromSerializedValuesAndKeyPath(
+ std_values, content::IndexedDBKeyPath(keyPath), &std_keys);
keys = std_keys;
}
@@ -150,9 +151,10 @@ BrowserWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath(
WebKit::WebSerializedScriptValue
BrowserWebKitPlatformSupportImpl::injectIDBKeyIntoSerializedValue(
const WebKit::WebIDBKey& key, const WebKit::WebSerializedScriptValue& value,
- const WebKit::WebString& keyPath) {
+ const WebKit::WebIDBKeyPath& keyPath) {
return IndexedDBKeyUtilityClient::InjectIDBKeyIntoSerializedValue(
- IndexedDBKey(key), content::SerializedScriptValue(value), keyPath);
+ IndexedDBKey(key), content::SerializedScriptValue(value),
+ content::IndexedDBKeyPath(keyPath));
}
GpuChannelHostFactory*

Powered by Google App Engine
This is Rietveld 408576698