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

Side by Side Diff: Source/modules/indexeddb/IDBKeyRange.cpp

Issue 1003713002: [bindings] Rename IDBBindingUtilities.cpp to V8BindingForModules.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
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
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 "modules/indexeddb/IDBKeyRange.h" 27 #include "modules/indexeddb/IDBKeyRange.h"
28 28
29 #include "bindings/core/v8/ExceptionState.h" 29 #include "bindings/core/v8/ExceptionState.h"
30 #include "bindings/modules/v8/IDBBindingUtilities.h" 30 #include "bindings/modules/v8/ToV8ForModules.h"
31 #include "bindings/modules/v8/V8BindingForModules.h"
31 #include "core/dom/ExceptionCode.h" 32 #include "core/dom/ExceptionCode.h"
32 #include "modules/indexeddb/IDBDatabase.h" 33 #include "modules/indexeddb/IDBDatabase.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 IDBKeyRange* IDBKeyRange::fromScriptValue(ExecutionContext* context, const Scrip tValue& value, ExceptionState& exceptionState) 37 IDBKeyRange* IDBKeyRange::fromScriptValue(ExecutionContext* context, const Scrip tValue& value, ExceptionState& exceptionState)
37 { 38 {
38 if (value.isUndefined() || value.isNull()) 39 if (value.isUndefined() || value.isNull())
39 return 0; 40 return 0;
40 41
41 IDBKeyRange* range = scriptValueToIDBKeyRange(toIsolate(context), value); 42 IDBKeyRange* range = script_value_cast<IDBKeyRange*>(value, toIsolate(contex t), exceptionState);
42 if (range) 43 if (range)
43 return range; 44 return range;
44 45
45 IDBKey* key = scriptValueToIDBKey(toIsolate(context), value); 46 IDBKey* key = script_value_cast<IDBKey*>(value, toIsolate(context), exceptio nState);
46 if (!key || !key->isValid()) { 47 if (!key || !key->isValid()) {
47 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage); 48 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage);
48 return 0; 49 return 0;
49 } 50 }
50 51
51 return new IDBKeyRange(key, key, LowerBoundClosed, UpperBoundClosed); 52 return new IDBKeyRange(key, key, LowerBoundClosed, UpperBoundClosed);
52 } 53 }
53 54
54 IDBKeyRange::IDBKeyRange(IDBKey* lower, IDBKey* upper, LowerBoundType lowerType, UpperBoundType upperType) 55 IDBKeyRange::IDBKeyRange(IDBKey* lower, IDBKey* upper, LowerBoundType lowerType, UpperBoundType upperType)
55 : m_lower(lower) 56 : m_lower(lower)
56 , m_upper(upper) 57 , m_upper(upper)
57 , m_lowerType(lowerType) 58 , m_lowerType(lowerType)
58 , m_upperType(upperType) 59 , m_upperType(upperType)
59 { 60 {
60 } 61 }
61 62
62 DEFINE_TRACE(IDBKeyRange) 63 DEFINE_TRACE(IDBKeyRange)
63 { 64 {
64 visitor->trace(m_lower); 65 visitor->trace(m_lower);
65 visitor->trace(m_upper); 66 visitor->trace(m_upper);
66 } 67 }
67 68
68 ScriptValue IDBKeyRange::lowerValue(ScriptState* scriptState) const 69 ScriptValue IDBKeyRange::lowerValue(ScriptState* scriptState) const
69 { 70 {
70 return idbKeyToScriptValue(scriptState, m_lower); 71 return ScriptValue::from(scriptState, m_lower);
71 } 72 }
72 73
73 ScriptValue IDBKeyRange::upperValue(ScriptState* scriptState) const 74 ScriptValue IDBKeyRange::upperValue(ScriptState* scriptState) const
74 { 75 {
75 return idbKeyToScriptValue(scriptState, m_upper); 76 return ScriptValue::from(scriptState, m_upper);
76 } 77 }
77 78
78 IDBKeyRange* IDBKeyRange::only(IDBKey* key, ExceptionState& exceptionState) 79 IDBKeyRange* IDBKeyRange::only(IDBKey* key, ExceptionState& exceptionState)
79 { 80 {
80 if (!key || !key->isValid()) { 81 if (!key || !key->isValid()) {
81 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage); 82 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage);
82 return 0; 83 return 0;
83 } 84 }
84 85
85 return IDBKeyRange::create(key, key, LowerBoundClosed, UpperBoundClosed); 86 return IDBKeyRange::create(key, key, LowerBoundClosed, UpperBoundClosed);
86 } 87 }
87 88
88 IDBKeyRange* IDBKeyRange::only(ExecutionContext* context, const ScriptValue& key Value, ExceptionState& exceptionState) 89 IDBKeyRange* IDBKeyRange::only(ExecutionContext* context, const ScriptValue& key Value, ExceptionState& exceptionState)
89 { 90 {
90 IDBKey* key = scriptValueToIDBKey(toIsolate(context), keyValue); 91 IDBKey* key = script_value_cast<IDBKey*>(keyValue, toIsolate(context), excep tionState);
91 if (!key || !key->isValid()) { 92 if (!key || !key->isValid()) {
92 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage); 93 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage);
93 return 0; 94 return 0;
94 } 95 }
95 96
96 return IDBKeyRange::create(key, key, LowerBoundClosed, UpperBoundClosed); 97 return IDBKeyRange::create(key, key, LowerBoundClosed, UpperBoundClosed);
97 } 98 }
98 99
99 IDBKeyRange* IDBKeyRange::lowerBound(ExecutionContext* context, const ScriptValu e& boundValue, bool open, ExceptionState& exceptionState) 100 IDBKeyRange* IDBKeyRange::lowerBound(ExecutionContext* context, const ScriptValu e& boundValue, bool open, ExceptionState& exceptionState)
100 { 101 {
101 IDBKey* bound = scriptValueToIDBKey(toIsolate(context), boundValue); 102 IDBKey* bound = script_value_cast<IDBKey*>(boundValue, toIsolate(context), e xceptionState);
102 if (!bound || !bound->isValid()) { 103 if (!bound || !bound->isValid()) {
103 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage); 104 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage);
104 return 0; 105 return 0;
105 } 106 }
106 107
107 return IDBKeyRange::create(bound, 0, open ? LowerBoundOpen : LowerBoundClose d, UpperBoundOpen); 108 return IDBKeyRange::create(bound, 0, open ? LowerBoundOpen : LowerBoundClose d, UpperBoundOpen);
108 } 109 }
109 110
110 IDBKeyRange* IDBKeyRange::upperBound(ExecutionContext* context, const ScriptValu e& boundValue, bool open, ExceptionState& exceptionState) 111 IDBKeyRange* IDBKeyRange::upperBound(ExecutionContext* context, const ScriptValu e& boundValue, bool open, ExceptionState& exceptionState)
111 { 112 {
112 IDBKey* bound = scriptValueToIDBKey(toIsolate(context), boundValue); 113 IDBKey* bound = script_value_cast<IDBKey*>(boundValue, toIsolate(context), e xceptionState);
113 if (!bound || !bound->isValid()) { 114 if (!bound || !bound->isValid()) {
114 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage); 115 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage);
115 return 0; 116 return 0;
116 } 117 }
117 118
118 return IDBKeyRange::create(0, bound, LowerBoundOpen, open ? UpperBoundOpen : UpperBoundClosed); 119 return IDBKeyRange::create(0, bound, LowerBoundOpen, open ? UpperBoundOpen : UpperBoundClosed);
119 } 120 }
120 121
121 IDBKeyRange* IDBKeyRange::bound(ExecutionContext* context, const ScriptValue& lo werValue, const ScriptValue& upperValue, bool lowerOpen, bool upperOpen, Excepti onState& exceptionState) 122 IDBKeyRange* IDBKeyRange::bound(ExecutionContext* context, const ScriptValue& lo werValue, const ScriptValue& upperValue, bool lowerOpen, bool upperOpen, Excepti onState& exceptionState)
122 { 123 {
123 IDBKey* lower = scriptValueToIDBKey(toIsolate(context), lowerValue); 124 IDBKey* lower = script_value_cast<IDBKey*>(lowerValue, toIsolate(context), e xceptionState);
124 IDBKey* upper = scriptValueToIDBKey(toIsolate(context), upperValue); 125 IDBKey* upper = script_value_cast<IDBKey*>(upperValue, toIsolate(context), e xceptionState);
125 126
126 if (!lower || !lower->isValid() || !upper || !upper->isValid()) { 127 if (!lower || !lower->isValid() || !upper || !upper->isValid()) {
127 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage); 128 exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErro rMessage);
128 return 0; 129 return 0;
129 } 130 }
130 if (upper->isLessThan(lower)) { 131 if (upper->isLessThan(lower)) {
131 exceptionState.throwDOMException(DataError, "The lower key is greater th an the upper key."); 132 exceptionState.throwDOMException(DataError, "The lower key is greater th an the upper key.");
132 return 0; 133 return 0;
133 } 134 }
134 if (upper->isEqual(lower) && (lowerOpen || upperOpen)) { 135 if (upper->isEqual(lower) && (lowerOpen || upperOpen)) {
135 exceptionState.throwDOMException(DataError, "The lower key and upper key are equal and one of the bounds is open."); 136 exceptionState.throwDOMException(DataError, "The lower key and upper key are equal and one of the bounds is open.");
136 return 0; 137 return 0;
137 } 138 }
138 139
139 return IDBKeyRange::create(lower, upper, lowerOpen ? LowerBoundOpen : LowerB oundClosed, upperOpen ? UpperBoundOpen : UpperBoundClosed); 140 return IDBKeyRange::create(lower, upper, lowerOpen ? LowerBoundOpen : LowerB oundClosed, upperOpen ? UpperBoundOpen : UpperBoundClosed);
140 } 141 }
141 142
142 } // namespace blink 143 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698