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

Side by Side Diff: Source/WebCore/bindings/v8/IDBBindingUtilities.h

Issue 11336016: Revert 128379 - IndexedDB: Use ScriptValue instead of SerializedScriptValue when possible (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 1 month 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 unified diff | Download patch
Property Changes:
Added: svn:mergeinfo
Merged /trunk/WebCore/bindings/v8/IDBBindingUtilities.h:r53455
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 10 matching lines...) Expand all
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef IDBBindingUtilities_h 26 #ifndef IDBBindingUtilities_h
27 #define IDBBindingUtilities_h 27 #define IDBBindingUtilities_h
28 28
29 #if ENABLE(INDEXED_DATABASE) 29 #if ENABLE(INDEXED_DATABASE)
30 30
31 #include "ScriptValue.h"
32 #include <v8.h> 31 #include <v8.h>
33 #include <wtf/Forward.h> 32 #include <wtf/Forward.h>
34 33
35 namespace WebCore { 34 namespace WebCore {
36 35
37 class IDBKey; 36 class IDBKey;
38 class IDBKeyPath; 37 class IDBKeyPath;
39 class SerializedScriptValue; 38 class SerializedScriptValue;
40 39
41 PassRefPtr<IDBKey> createIDBKeyFromValue(v8::Handle<v8::Value>); 40 PassRefPtr<IDBKey> createIDBKeyFromValue(v8::Handle<v8::Value>);
42
43 // FIXME: remove the SerializedValue versions when their use is finally removed in https://bugs.webkit.org/show_bug.cgi?id=95409.
44 PassRefPtr<IDBKey> createIDBKeyFromSerializedValueAndKeyPath(PassRefPtr<Serializ edScriptValue>, const IDBKeyPath&); 41 PassRefPtr<IDBKey> createIDBKeyFromSerializedValueAndKeyPath(PassRefPtr<Serializ edScriptValue>, const IDBKeyPath&);
45 PassRefPtr<SerializedScriptValue> injectIDBKeyIntoSerializedValue(PassRefPtr<IDB Key>, PassRefPtr<SerializedScriptValue>, const IDBKeyPath&); 42 PassRefPtr<SerializedScriptValue> injectIDBKeyIntoSerializedValue(PassRefPtr<IDB Key>, PassRefPtr<SerializedScriptValue>, const IDBKeyPath&);
46 43
47 PassRefPtr<IDBKey> createIDBKeyFromScriptValueAndKeyPath(const ScriptValue&, con st IDBKeyPath&);
48 bool canInjectIDBKeyIntoScriptValue(const ScriptValue&, const IDBKeyPath&);
49 ScriptValue deserializeIDBValue(ScriptExecutionContext*, PassRefPtr<SerializedSc riptValue>);
50
51 } 44 }
52 45
53 #endif // ENABLE(INDEXED_DATABASE) 46 #endif // ENABLE(INDEXED_DATABASE)
54 47
55 #endif // IDBBindingUtilities_h 48 #endif // IDBBindingUtilities_h
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/indexeddb/IDBObjectStore.idl ('k') | Source/WebCore/bindings/v8/IDBBindingUtilities.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698