Index: third_party/WebKit/Source/bindings/tests/results/core/V8VoidExperimentalCallbackFunction.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8VoidExperimentalCallbackFunction.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8VoidExperimentalCallbackFunction.cpp |
index 56704495e31a4ff73142a0d59e02b71becc9243c..c810deca26c91c3054f12aaf753bb10219b58347 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8VoidExperimentalCallbackFunction.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8VoidExperimentalCallbackFunction.cpp |
@@ -7,6 +7,7 @@ |
#include "V8VoidExperimentalCallbackFunction.h" |
#include "bindings/core/v8/ScriptState.h" |
+#include "bindings/core/v8/ToV8.h" |
#include "bindings/core/v8/V8Binding.h" |
#include "wtf/Assertions.h" |
@@ -23,25 +24,26 @@ DEFINE_TRACE(V8VoidExperimentalCallbackFunction) |
{ |
} |
-bool V8VoidExperimentalCallbackFunction::call(ScriptState* scriptState, ScriptWrappable* scriptWrappable) |
+bool V8VoidExperimentalCallbackFunction::call(ScriptState* scriptState, ScriptWrappable* scriptWrappable, ExceptionState& exceptionState) |
{ |
if (!scriptState->contextIsValid()) |
return false; |
if (m_callback.isEmpty()) |
return false; |
+ |
ScriptState::Scope scope(scriptState); |
v8::Local<v8::Value> *argv = nullptr; |
v8::Local<v8::Value> v8ReturnValue; |
v8::TryCatch exceptionCatcher(scriptState->isolate()); |
- exceptionCatcher.SetVerbose(true); |
- |
if (V8ScriptRunner::callFunction(m_callback.newLocal(scriptState->isolate()), scriptState->getExecutionContext(), scriptState->context()->Global(), 0, argv, scriptState->isolate()).ToLocal(&v8ReturnValue)) |
{ |
return true; |
} |
+ DCHECK(exceptionCatcher.HasCaught()); |
+ exceptionState.rethrowV8Exception(exceptionCatcher.Exception()); |
return false; |
} |