OLD | NEW |
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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 13 matching lines...) Expand all Loading... |
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #include "config.h" | 28 #include "config.h" |
29 | 29 |
30 #if ENABLE(INDEXED_DATABASE) | 30 #if ENABLE(INDEXED_DATABASE) |
31 | 31 |
32 #include "V8IDBAny.h" | 32 #include "V8IDBAny.h" |
33 | 33 |
34 #include "ScriptValue.h" | 34 #include "SerializedScriptValue.h" |
35 #include "V8Binding.h" | 35 #include "V8Binding.h" |
36 #include "V8DOMStringList.h" | 36 #include "V8DOMStringList.h" |
37 #include "V8IDBCursor.h" | 37 #include "V8IDBCursor.h" |
38 #include "V8IDBCursorWithValue.h" | 38 #include "V8IDBCursorWithValue.h" |
39 #include "V8IDBDatabase.h" | 39 #include "V8IDBDatabase.h" |
40 #include "V8IDBFactory.h" | 40 #include "V8IDBFactory.h" |
41 #include "V8IDBIndex.h" | 41 #include "V8IDBIndex.h" |
42 #include "V8IDBKey.h" | 42 #include "V8IDBKey.h" |
43 #include "V8IDBObjectStore.h" | 43 #include "V8IDBObjectStore.h" |
44 #include "V8IDBTransaction.h" | 44 #include "V8IDBTransaction.h" |
(...skipping 21 matching lines...) Expand all Loading... |
66 case IDBAny::IDBFactoryType: | 66 case IDBAny::IDBFactoryType: |
67 return toV8(impl->idbFactory(), creationContext, isolate); | 67 return toV8(impl->idbFactory(), creationContext, isolate); |
68 case IDBAny::IDBIndexType: | 68 case IDBAny::IDBIndexType: |
69 return toV8(impl->idbIndex(), creationContext, isolate); | 69 return toV8(impl->idbIndex(), creationContext, isolate); |
70 case IDBAny::IDBKeyType: | 70 case IDBAny::IDBKeyType: |
71 return toV8(impl->idbKey(), creationContext, isolate); | 71 return toV8(impl->idbKey(), creationContext, isolate); |
72 case IDBAny::IDBObjectStoreType: | 72 case IDBAny::IDBObjectStoreType: |
73 return toV8(impl->idbObjectStore(), creationContext, isolate); | 73 return toV8(impl->idbObjectStore(), creationContext, isolate); |
74 case IDBAny::IDBTransactionType: | 74 case IDBAny::IDBTransactionType: |
75 return toV8(impl->idbTransaction(), creationContext, isolate); | 75 return toV8(impl->idbTransaction(), creationContext, isolate); |
76 case IDBAny::ScriptValueType: | 76 case IDBAny::SerializedScriptValueType: |
77 return impl->scriptValue().v8Value(); | 77 return impl->serializedScriptValue()->deserialize(0, isolate); |
78 case IDBAny::StringType: | 78 case IDBAny::StringType: |
79 return v8String(impl->string(), isolate); | 79 return v8String(impl->string(), isolate); |
80 case IDBAny::IntegerType: | |
81 return v8::Number::New(impl->integer()); | |
82 } | 80 } |
83 | 81 |
84 ASSERT_NOT_REACHED(); | 82 ASSERT_NOT_REACHED(); |
85 return v8::Undefined(); | 83 return v8::Undefined(); |
86 } | 84 } |
87 | 85 |
88 } // namespace WebCore | 86 } // namespace WebCore |
89 | 87 |
90 #endif // ENABLE(INDEXED_DATABASE) | 88 #endif // ENABLE(INDEXED_DATABASE) |
OLD | NEW |