OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 TONATIVE_VOID(double, sqlValue, value->NumberValue()); | 83 TONATIVE_VOID(double, sqlValue, value->NumberValue()); |
84 sqlValues.append(SQLValue(sqlValue)); | 84 sqlValues.append(SQLValue(sqlValue)); |
85 } else { | 85 } else { |
86 TOSTRING_VOID(V8StringResource<>, sqlValue, value); | 86 TOSTRING_VOID(V8StringResource<>, sqlValue, value); |
87 sqlValues.append(SQLValue(sqlValue)); | 87 sqlValues.append(SQLValue(sqlValue)); |
88 } | 88 } |
89 } | 89 } |
90 } | 90 } |
91 | 91 |
92 SQLTransaction* transaction = V8SQLTransaction::toImpl(info.Holder()); | 92 SQLTransaction* transaction = V8SQLTransaction::toImpl(info.Holder()); |
93 OwnPtrWillBeRawPtr<SQLStatementCallback> callback = nullptr; | 93 SQLStatementCallback* callback; |
94 if (info.Length() > 2 && !isUndefinedOrNull(info[2])) { | 94 if (!isUndefinedOrNull(info[2])) { |
95 if (!info[2]->IsFunction()) { | 95 if (!info[2]->IsFunction()) { |
96 exceptionState.throwDOMException(TypeMismatchError, "The 'callback'
(2nd) argument provided is not a function."); | 96 exceptionState.throwDOMException(TypeMismatchError, "The 'callback'
(2nd) argument provided is not a function."); |
97 exceptionState.throwIfNeeded(); | 97 exceptionState.throwIfNeeded(); |
98 return; | 98 return; |
99 } | 99 } |
100 callback = V8SQLStatementCallback::create(v8::Handle<v8::Function>::Cast
(info[2]), ScriptState::current(info.GetIsolate())); | 100 callback = V8SQLStatementCallback::create(v8::Handle<v8::Function>::Cast
(info[2]), ScriptState::current(info.GetIsolate())); |
| 101 } else { |
| 102 callback = nullptr; |
101 } | 103 } |
102 | 104 |
103 OwnPtrWillBeRawPtr<SQLStatementErrorCallback> errorCallback = nullptr; | 105 SQLStatementErrorCallback* errorCallback; |
104 if (info.Length() > 3 && !isUndefinedOrNull(info[3])) { | 106 if (!isUndefinedOrNull(info[3])) { |
105 if (!info[3]->IsFunction()) { | 107 if (!info[3]->IsFunction()) { |
106 exceptionState.throwDOMException(TypeMismatchError, "The 'errorCallb
ack' (3rd) argument provided is not a function."); | 108 exceptionState.throwDOMException(TypeMismatchError, "The 'errorCallb
ack' (3rd) argument provided is not a function."); |
107 exceptionState.throwIfNeeded(); | 109 exceptionState.throwIfNeeded(); |
108 return; | 110 return; |
109 } | 111 } |
110 errorCallback = V8SQLStatementErrorCallback::create(v8::Handle<v8::Funct
ion>::Cast(info[3]), ScriptState::current(info.GetIsolate())); | 112 errorCallback = V8SQLStatementErrorCallback::create(v8::Handle<v8::Funct
ion>::Cast(info[3]), ScriptState::current(info.GetIsolate())); |
| 113 } else { |
| 114 errorCallback = nullptr; |
111 } | 115 } |
112 | 116 |
113 transaction->executeSQL(statement, sqlValues, callback.release(), errorCallb
ack.release(), exceptionState); | 117 transaction->executeSQL(statement, sqlValues, callback, errorCallback, excep
tionState); |
114 exceptionState.throwIfNeeded(); | 118 exceptionState.throwIfNeeded(); |
115 } | 119 } |
116 | 120 |
117 } // namespace blink | 121 } // namespace blink |
OLD | NEW |