Index: third_party/WebKit/Source/bindings/tests/results/core/V8LongExperimentalCallbackFunction.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8LongExperimentalCallbackFunction.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8LongExperimentalCallbackFunction.cpp |
index da8a688d788174fa253d2a33dfc5035fb2dd8356..3dafec70ef9c80fbb4c9f496a7539bb4d72dc8e8 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8LongExperimentalCallbackFunction.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8LongExperimentalCallbackFunction.cpp |
@@ -7,6 +7,7 @@ |
#include "V8LongExperimentalCallbackFunction.h" |
#include "bindings/core/v8/ScriptState.h" |
+#include "bindings/core/v8/ToV8.h" |
#include "bindings/core/v8/V8Binding.h" |
#include "wtf/Assertions.h" |
@@ -23,13 +24,14 @@ DEFINE_TRACE(V8LongExperimentalCallbackFunction) |
{ |
} |
-bool V8LongExperimentalCallbackFunction::call(ScriptState* scriptState, ScriptWrappable* scriptWrappable, int num1, int num2, int& returnValue) |
+bool V8LongExperimentalCallbackFunction::call(ScriptState* scriptState, ScriptWrappable* scriptWrappable, ExceptionState& exceptionState, int num1, int num2, int& returnValue) |
{ |
if (!scriptState->contextIsValid()) |
return false; |
if (m_callback.isEmpty()) |
return false; |
+ |
ScriptState::Scope scope(scriptState); |
v8::Local<v8::Value> num1Argument = v8::Integer::New(scriptState->isolate(), num1); |
@@ -38,16 +40,16 @@ bool V8LongExperimentalCallbackFunction::call(ScriptState* scriptState, ScriptWr |
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(), 2, argv, scriptState->isolate()).ToLocal(&v8ReturnValue)) |
{ |
- int cppValue = toInt32(info.GetIsolate(), v8ReturnValue, NormalConversion, exceptionState); |
+ int cppValue = toInt32(scriptState->isolate(), v8ReturnValue, NormalConversion, exceptionState); |
if (exceptionState.hadException()) |
return false; |
returnValue = cppValue; |
return true; |
} |
+ DCHECK(exceptionCatcher.HasCaught()); |
+ exceptionState.rethrowV8Exception(exceptionCatcher.Exception()); |
return false; |
} |