| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (c) 2009, 2012 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 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptController.h" | 33 #include "bindings/core/v8/ScriptController.h" |
| 34 #include "bindings/core/v8/V8Binding.h" |
| 34 #include "bindings/modules/v8/V8SQLError.h" | 35 #include "bindings/modules/v8/V8SQLError.h" |
| 35 #include "bindings/modules/v8/V8SQLStatementErrorCallback.h" | 36 #include "bindings/modules/v8/V8SQLStatementErrorCallback.h" |
| 36 #include "bindings/modules/v8/V8SQLTransaction.h" | 37 #include "bindings/modules/v8/V8SQLTransaction.h" |
| 37 #include "core/dom/ExecutionContext.h" | 38 #include "core/dom/ExecutionContext.h" |
| 38 #include "wtf/Assertions.h" | 39 #include "wtf/Assertions.h" |
| 39 | 40 |
| 40 namespace blink { | 41 namespace blink { |
| 41 | 42 |
| 42 bool V8SQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLEr
ror* error) | 43 bool V8SQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLEr
ror* error) |
| 43 { | 44 { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 69 exceptionCatcher.SetVerbose(true); | 70 exceptionCatcher.SetVerbose(true); |
| 70 | 71 |
| 71 v8::Local<v8::Value> result = ScriptController::callFunction(executionContex
t(), m_callback.newLocal(isolate), m_scriptState->context()->Global(), WTF_ARRAY
_LENGTH(argv), argv, isolate); | 72 v8::Local<v8::Value> result = ScriptController::callFunction(executionContex
t(), m_callback.newLocal(isolate), m_scriptState->context()->Global(), WTF_ARRAY
_LENGTH(argv), argv, isolate); |
| 72 | 73 |
| 73 // FIXME: This comment doesn't make much sense given what the code is actual
ly doing. | 74 // FIXME: This comment doesn't make much sense given what the code is actual
ly doing. |
| 74 // | 75 // |
| 75 // Step 6: If the error callback returns false, then move on to the next | 76 // Step 6: If the error callback returns false, then move on to the next |
| 76 // statement, if any, or onto the next overall step otherwise. Otherwise, | 77 // statement, if any, or onto the next overall step otherwise. Otherwise, |
| 77 // the error callback did not return false, or there was no error callback. | 78 // the error callback did not return false, or there was no error callback. |
| 78 // Jump to the last step in the overall steps. | 79 // Jump to the last step in the overall steps. |
| 79 return exceptionCatcher.HasCaught() || (!result.IsEmpty() && result->Boolean
Value()); | 80 if (exceptionCatcher.HasCaught()) |
| 81 return true; |
| 82 bool value; |
| 83 V8_CALL(value, result, BooleanValue(isolate->GetCurrentContext()), return tr
ue); |
| 84 return value; |
| 80 } | 85 } |
| 81 | 86 |
| 82 } // namespace blink | 87 } // namespace blink |
| OLD | NEW |