| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/glue/idb_bindings.h" | 5 #include "webkit/glue/idb_bindings.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/string16.h" | 9 #include "base/string16.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" | 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" |
| 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h" | 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h" |
| 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptVa
lue.h" | 13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerialize
dScriptValue.h" |
| 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" | 14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
| 15 | 15 |
| 16 namespace webkit_glue { | 16 namespace webkit_glue { |
| 17 | 17 |
| 18 using WebKit::WebIDBKey; | 18 using WebKit::WebIDBKey; |
| 19 using WebKit::WebIDBKeyPath; | 19 using WebKit::WebIDBKeyPath; |
| 20 using WebKit::WebSerializedScriptValue; | 20 using WebKit::WebSerializedScriptValue; |
| 21 | 21 |
| 22 bool IDBKeysFromValuesAndKeyPath( | 22 bool IDBKeysFromValuesAndKeyPath( |
| 23 const std::vector<WebSerializedScriptValue>& serialized_script_values, | 23 const std::vector<WebSerializedScriptValue>& serialized_script_values, |
| 24 const string16& idb_key_path, | 24 const string16& idb_key_path, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 42 | 42 |
| 43 WebSerializedScriptValue InjectIDBKey( | 43 WebSerializedScriptValue InjectIDBKey( |
| 44 const WebIDBKey& key, | 44 const WebIDBKey& key, |
| 45 const WebSerializedScriptValue& value, | 45 const WebSerializedScriptValue& value, |
| 46 const string16& idb_key_path) { | 46 const string16& idb_key_path) { |
| 47 return WebIDBKey::injectIDBKeyIntoSerializedValue( | 47 return WebIDBKey::injectIDBKeyIntoSerializedValue( |
| 48 key, value, WebIDBKeyPath::create(idb_key_path)); | 48 key, value, WebIDBKeyPath::create(idb_key_path)); |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace webkit_glue | 51 } // namespace webkit_glue |
| OLD | NEW |