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