Add 'error' property to exceptions thrown via Worker::importScripts.

Source/bindings/v8/V8ErrorHandler.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "bindings/v8/V8ErrorHandler.h"
 
+#include "V8ErrorEvent.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8HiddenPropertyName.h"
 #include "bindings/v8/V8ScriptRunner.h"
+#include "core/dom/Document.h"
 #include "core/dom/ErrorEvent.h"
 #include "core/dom/EventNames.h"
+#include "core/dom/ScriptExecutionContext.h"
+#include "core/page/Frame.h"
 
 namespace WebCore {
 
 V8ErrorHandler::V8ErrorHandler(v8::Local<v8::Object> listener, bool isInline)
     : V8EventListener(listener, isInline)
 {
 }
 
 v8::Local<v8::Value> V8ErrorHandler::callListenerFunction(ScriptExecutionContext* context, v8::Handle<v8::Value> jsEvent, Event* event)
 {
@@ skipping 16 matching lines @@
         v8::TryCatch tryCatch;
         tryCatch.SetVerbose(true);
         if (worldType(isolate) == WorkerWorld)
             returnValue = V8ScriptRunner::callFunction(callFunction, context, thisValue, WTF_ARRAY_LENGTH(parameters), parameters);
         else
             returnValue = ScriptController::callFunctionWithInstrumentation(0, callFunction, thisValue, WTF_ARRAY_LENGTH(parameters), parameters);
     }
     return returnValue;
 }
 
+// static
+void V8ErrorHandler::storeExceptionOnErrorEventWrapper(ScriptExecutionContext* context, ErrorEvent* event, v8::Handle<v8::Value> data, v8::Isolate* isolate)
+{
+    if (context->isDocument()) {
+        // This method might be called while we're creating a new context. Since we

[adamk, 2013/08/09 17:11:32]

Why move this code? It seems like it would work fine to leave it in
messageHandlerInMainThread, which would allow this comment to continue making
sense. Right now, the only time it could be called at a "bad" time is by that
function anyway. Basically, you could just guard the
storeExceptionOnErrorEventWrapper() call with the existingWindowShell() check.

[Mike West, 2013/08/09 20:34:51]

It seemed better to have one spot where the wrapping/hidden value work happened,
rather than copy/pasting a few lines a few times. If you feel like that's
overcomplicating things, I can go back to copy/paste. :)

[adamk, 2013/08/09 21:29:25]

I'm confused: I'm suggesting sharing the wrapping/hidden value work, but moving
this bail-out back to the original caller. That is, keep the last 5 lines of
this function, but move the first 8 lines back to where they were before.

[Mike West, 2013/08/09 21:38:45]

Ah, sorry. I thought you were asking "Why move all this code", not "Why move
this bailout."

That makes sense, I'll rework it on Monday.

+        // cannot create a wrapper during context creation, we bail out early.
+        DOMWrapperWorld* world = DOMWrapperWorld::current();
+        Frame* frame = toDocument(context)->frame();
+        if (!world || !frame || !frame->script()->existingWindowShell(world))
+            return;
+    }
+
+    v8::Local<v8::Value> wrappedEvent = toV8(event, v8::Handle<v8::Object>(), isolate);
+    if (!wrappedEvent.IsEmpty()) {
+        ASSERT(wrappedEvent->IsObject());
+        v8::Local<v8::Object>::Cast(wrappedEvent)->SetHiddenValue(V8HiddenPropertyName::error(), data);
+    }
+}
+
 bool V8ErrorHandler::shouldPreventDefault(v8::Local<v8::Value> returnValue)
 {
     return returnValue->IsBoolean() && returnValue->BooleanValue();
 }
 
 } // namespace WebCore