OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 |
11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
13 * | 13 * |
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
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 #include "config.h" | 26 #include "config.h" |
27 #include "bindings/v8/IDBBindingUtilities.h" | 27 #include "bindings/v8/IDBBindingUtilities.h" |
28 | 28 |
| 29 #include "V8IDBKeyRange.h" |
29 #include "bindings/v8/DOMRequestState.h" | 30 #include "bindings/v8/DOMRequestState.h" |
30 #include "bindings/v8/SerializedScriptValue.h" | 31 #include "bindings/v8/SerializedScriptValue.h" |
31 #include "bindings/v8/V8Binding.h" | 32 #include "bindings/v8/V8Binding.h" |
32 #include "core/platform/SharedBuffer.h" | 33 #include "core/platform/SharedBuffer.h" |
33 #include "modules/indexeddb/IDBKey.h" | 34 #include "modules/indexeddb/IDBKey.h" |
34 #include "modules/indexeddb/IDBKeyPath.h" | 35 #include "modules/indexeddb/IDBKeyPath.h" |
| 36 #include "modules/indexeddb/IDBKeyRange.h" |
35 #include "modules/indexeddb/IDBTracing.h" | 37 #include "modules/indexeddb/IDBTracing.h" |
36 #include "wtf/MathExtras.h" | 38 #include "wtf/MathExtras.h" |
37 #include "wtf/Vector.h" | 39 #include "wtf/Vector.h" |
38 | 40 |
39 namespace WebCore { | 41 namespace WebCore { |
40 | 42 |
41 static v8::Handle<v8::Value> idbKeyToV8Value(IDBKey* key, v8::Isolate* isolate) | 43 static v8::Handle<v8::Value> idbKeyToV8Value(IDBKey* key, v8::Isolate* isolate) |
42 { | 44 { |
43 if (!key) { | 45 if (!key) { |
44 // This should be undefined, not null. | 46 // This should be undefined, not null. |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 | 326 |
325 PassRefPtr<IDBKey> scriptValueToIDBKey(DOMRequestState* state, const ScriptValue
& scriptValue) | 327 PassRefPtr<IDBKey> scriptValueToIDBKey(DOMRequestState* state, const ScriptValue
& scriptValue) |
326 { | 328 { |
327 ASSERT(v8::Context::InContext()); | 329 ASSERT(v8::Context::InContext()); |
328 v8::Isolate* isolate = state ? state->context()->GetIsolate() : v8::Isolate:
:GetCurrent(); | 330 v8::Isolate* isolate = state ? state->context()->GetIsolate() : v8::Isolate:
:GetCurrent(); |
329 v8::HandleScope handleScope(isolate); | 331 v8::HandleScope handleScope(isolate); |
330 v8::Handle<v8::Value> v8Value(scriptValue.v8Value()); | 332 v8::Handle<v8::Value> v8Value(scriptValue.v8Value()); |
331 return createIDBKeyFromValue(v8Value); | 333 return createIDBKeyFromValue(v8Value); |
332 } | 334 } |
333 | 335 |
| 336 PassRefPtr<IDBKeyRange> scriptValueToIDBKeyRange(DOMRequestState* state, const S
criptValue& scriptValue) |
| 337 { |
| 338 v8::Isolate* isolate = state ? state->context()->GetIsolate() : v8::Isolate:
:GetCurrent(); |
| 339 v8::HandleScope handleScope(isolate); |
| 340 v8::Handle<v8::Value> value(scriptValue.v8Value()); |
| 341 if (V8IDBKeyRange::HasInstance(value, isolate, worldType(isolate))) |
| 342 return V8IDBKeyRange::toNative(value.As<v8::Object>()); |
| 343 return 0; |
| 344 } |
| 345 |
334 } // namespace WebCore | 346 } // namespace WebCore |
OLD | NEW |