Chromium Code Reviews| Index: Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp |
| diff --git a/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp b/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp |
| index 253d395cb77079bd5b3ea894170dda30e70036f1..4720509dae4986722cf006a6783d89a8c98710db 100644 |
| --- a/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp |
| +++ b/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp |
| @@ -69,16 +69,16 @@ bool V8SQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLEr |
| v8::TryCatch exceptionCatcher; |
|
haraken
2015/04/18 23:10:47
Is this v8::TryCatch still needed?
bashi
2015/04/21 00:15:40
I guess so. IIUC, it swallows an exception.
|
| exceptionCatcher.SetVerbose(true); |
| - v8::Local<v8::Value> result = ScriptController::callFunction(executionContext(), m_callback.newLocal(isolate), m_scriptState->context()->Global(), WTF_ARRAY_LENGTH(argv), argv, isolate); |
| - |
| + v8::Local<v8::Value> result; |
| // FIXME: This comment doesn't make much sense given what the code is actually doing. |
| // |
| // Step 6: If the error callback returns false, then move on to the next |
| // statement, if any, or onto the next overall step otherwise. Otherwise, |
| // the error callback did not return false, or there was no error callback. |
| // Jump to the last step in the overall steps. |
| - if (exceptionCatcher.HasCaught()) |
| + if (!ScriptController::callFunction(executionContext(), m_callback.newLocal(isolate), m_scriptState->context()->Global(), WTF_ARRAY_LENGTH(argv), argv, isolate).ToLocal(&result)) |
| return true; |
| + |
| bool value; |
| V8_CALL(value, result, BooleanValue(isolate->GetCurrentContext()), return true); |
| return value; |