| Index: Source/bindings/v8/V8Initializer.cpp
|
| diff --git a/Source/bindings/v8/V8Initializer.cpp b/Source/bindings/v8/V8Initializer.cpp
|
| index d521b34126f8e733ce1ee598f5ea7df1b29e7677..a7682f91ffe89689f1f4c7f0dcd4fe8dd5002465 100644
|
| --- a/Source/bindings/v8/V8Initializer.cpp
|
| +++ b/Source/bindings/v8/V8Initializer.cpp
|
| @@ -29,10 +29,12 @@
|
| #include "V8History.h"
|
| #include "V8Location.h"
|
| #include "V8Window.h"
|
| +#include "bindings/v8/DOMWrapperWorld.h"
|
| #include "bindings/v8/ScriptCallStackFactory.h"
|
| #include "bindings/v8/ScriptProfiler.h"
|
| #include "bindings/v8/V8Binding.h"
|
| #include "bindings/v8/V8GCController.h"
|
| +#include "bindings/v8/V8HiddenPropertyName.h"
|
| #include "bindings/v8/V8PerContextData.h"
|
| #include "core/dom/Document.h"
|
| #include "core/dom/ExceptionCode.h"
|
| @@ -94,7 +96,8 @@ static void messageHandlerInMainThread(v8::Handle<v8::Message> message, v8::Hand
|
| v8::Handle<v8::Value> resourceName = message->GetScriptResourceName();
|
| bool shouldUseDocumentURL = resourceName.IsEmpty() || !resourceName->IsString();
|
| String resource = shouldUseDocumentURL ? firstWindow->document()->url() : toWebCoreString(resourceName);
|
| - firstWindow->document()->reportException(errorMessage, message->GetLineNumber(), message->GetStartColumn(), resource, callStack);
|
| + data->ToObject()->SetHiddenValue(V8HiddenPropertyName::worldId(), v8::Integer::New(DOMWrapperWorld::current()->worldId()));
|
| + firstWindow->document()->reportException(errorMessage, message->GetLineNumber(), message->GetStartColumn(), resource, callStack, ScriptValue(data));
|
| }
|
|
|
| static void failedAccessCheckCallbackInMainThread(v8::Local<v8::Object> host, v8::AccessType type, v8::Local<v8::Value> data)
|
| @@ -165,7 +168,8 @@ static void messageHandlerInWorker(v8::Handle<v8::Message> message, v8::Handle<v
|
| int lineNumber = message->GetLineNumber();
|
| int columnNumber = message->GetStartColumn();
|
| String sourceURL = toWebCoreString(message->GetScriptResourceName());
|
| - context->reportException(errorMessage, lineNumber, columnNumber, sourceURL, 0);
|
| + data->ToObject()->SetHiddenValue(V8HiddenPropertyName::worldId(), v8::Integer::New(DOMWrapperWorld::current()->worldId()));
|
| + context->reportException(errorMessage, lineNumber, columnNumber, sourceURL, 0, ScriptValue(data));
|
| }
|
|
|
| isReportingException = false;
|
|
|