Chromium Code Reviews| Index: Source/bindings/v8/V8ErrorHandler.cpp |
| diff --git a/Source/bindings/v8/V8ErrorHandler.cpp b/Source/bindings/v8/V8ErrorHandler.cpp |
| index 397c6a35203a974d2d944f8392a5f63e45922932..f6482c4b8b3c128d45de0b29fc92abaf4ecee379 100644 |
| --- a/Source/bindings/v8/V8ErrorHandler.cpp |
| +++ b/Source/bindings/v8/V8ErrorHandler.cpp |
| @@ -31,8 +31,10 @@ |
| #include "config.h" |
| #include "bindings/v8/V8ErrorHandler.h" |
| +#include "bindings/v8/DOMWrapperWorld.h" |
| #include "bindings/v8/ScriptController.h" |
| #include "bindings/v8/V8Binding.h" |
| +#include "bindings/v8/V8HiddenPropertyName.h" |
| #include "bindings/v8/V8ScriptRunner.h" |
| #include "core/dom/ErrorEvent.h" |
| #include "core/dom/EventNames.h" |
| @@ -56,7 +58,12 @@ v8::Local<v8::Value> V8ErrorHandler::callListenerFunction(ScriptExecutionContext |
| if (!listener.IsEmpty() && listener->IsFunction()) { |
| v8::Local<v8::Function> callFunction = v8::Local<v8::Function>::Cast(listener); |
| v8::Local<v8::Object> thisValue = v8::Context::GetCurrent()->Global(); |
| - v8::Handle<v8::Value> parameters[4] = { v8String(errorEvent->message(), isolate), v8String(errorEvent->filename(), isolate), v8::Integer::New(errorEvent->lineno(), isolate), v8::Integer::New(errorEvent->colno(), isolate) }; |
| + |
| + v8::Local<v8::Value> error = jsEvent->ToObject()->GetHiddenValue(V8HiddenPropertyName::error()); |
| + if (error.IsEmpty()) |
| + error = v8::Local<v8::Value>(v8::Undefined(isolate)); |
|
dcarney
2013/07/30 18:51:58
nit: shouldn't need the extra Local wrapper
Mike West
2013/08/01 07:52:15
Done.
|
| + |
| + v8::Handle<v8::Value> parameters[5] = { v8String(errorEvent->message(), isolate), v8String(errorEvent->filename(), isolate), v8::Integer::New(errorEvent->lineno(), isolate), v8::Integer::New(errorEvent->colno(), isolate), error }; |
| v8::TryCatch tryCatch; |
| tryCatch.SetVerbose(true); |
| if (worldType(isolate) == WorkerWorld) |