Handle rejected promises better for workers.

Source/bindings/core/v8/V8Initializer.cpp

 /*
  * Copyright (C) 2009 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 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/core/v8/V8Initializer.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
+#include "bindings/core/v8/RejectedPromises.h"
 #include "bindings/core/v8/ScriptCallStackFactory.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptProfiler.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMException.h"
 #include "bindings/core/v8/V8ErrorEvent.h"
 #include "bindings/core/v8/V8ErrorHandler.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8History.h"
 #include "bindings/core/v8/V8Location.h"
 #include "bindings/core/v8/V8PerContextData.h"
 #include "bindings/core/v8/V8Window.h"
+#include "bindings/core/v8/WorkerScriptController.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/fetch/AccessControlStatus.h"
 #include "core/frame/ConsoleTypes.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
-#include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/ScriptArguments.h"
 #include "core/inspector/ScriptCallStack.h"
+#include "core/workers/WorkerGlobalScope.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
 #include "platform/heap/AddressSanitizer.h"
 #include "platform/scheduler/Scheduler.h"
 #include "public/platform/Platform.h"
 #include "wtf/ArrayBufferContents.h"
 #include "wtf/RefPtr.h"
-#include "wtf/ThreadSpecific.h"
 #include "wtf/text/WTFString.h"
 #include <v8-debug.h>
 
 namespace blink {
 
 static Frame* findFrame(v8::Local<v8::Object> host, v8::Local<v8::Value> data, v8::Isolate* isolate)
 {
     const WrapperTypeInfo* type = WrapperTypeInfo::unwrap(data);
 
     if (V8Window::wrapperTypeInfo.equals(type)) {
@@ skipping 106 matching lines @@
         // in user's scripts).
         EventDispatchForbiddenScope::AllowUserAgentEvents allowUserAgentEvents;
         enteredWindow->document()->reportException(event.release(), scriptId, callStack, corsStatus);
     } else {
         enteredWindow->document()->reportException(event.release(), scriptId, callStack, corsStatus);
     }
 }
 
 namespace {
 
-class PromiseRejectMessage {
-    ALLOW_ONLY_INLINE_ALLOCATION();
-public:
-    PromiseRejectMessage(const ScriptValue& promise, const ScriptValue& exception, const String& errorMessage, const String& resourceName, int scriptId, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
-        : m_promise(promise)
-        , m_exception(exception)
-        , m_errorMessage(errorMessage)
-        , m_resourceName(resourceName)
-        , m_scriptId(scriptId)
-        , m_lineNumber(lineNumber)
-        , m_columnNumber(columnNumber)
-        , m_callStack(callStack)
-    {
-    }
-
-    void trace(Visitor* visitor)
-    {
-        visitor->trace(m_callStack);
-    }
-
-    const ScriptValue m_promise;
-    const ScriptValue m_exception;
-    const String m_errorMessage;
-    const String m_resourceName;
-    const int m_scriptId;
-    const int m_lineNumber;
-    const int m_columnNumber;
-    const RefPtrWillBeMember<ScriptCallStack> m_callStack;
-};
-
-class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
-    virtual void* Allocate(size_t size) override
-    {
-        void* data;
-        WTF::ArrayBufferContents::allocateMemory(size, WTF::ArrayBufferContents::ZeroInitialize, data);
-        return data;
-    }
-
-    virtual void* AllocateUninitialized(size_t size) override
-    {
-        void* data;
-        WTF::ArrayBufferContents::allocateMemory(size, WTF::ArrayBufferContents::DontInitialize, data);
-        return data;
-    }
-
-    virtual void Free(void* data, size_t size) override
-    {
-        WTF::ArrayBufferContents::freeMemory(data, size);
-    }
-};
+static RejectedPromises& rejectedPromisesOnMainThread()
+{
+    ASSERT(isMainThread());
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<RejectedPromises>, rejectedPromises, (adoptPtrWillBeNoop (new RejectedPromises())));

[haraken, 2015/02/08 01:53:55]

Nit: Unnecessary space after Noop.

[sof, 2015/02/08 07:26:47]

Removed

+    return *rejectedPromises;
+}
 
 } // namespace
 
-typedef Deque<PromiseRejectMessage> PromiseRejectMessageQueue;
-
-static PromiseRejectMessageQueue& promiseRejectMessageQueue()
+void V8Initializer::reportRejectedPromisesOnMainThread()
 {
-    AtomicallyInitializedStaticReference(ThreadSpecific<PromiseRejectMessageQueue>, queue, new ThreadSpecific<PromiseRejectMessageQueue>);
-    return *queue;
-}
-
-void V8Initializer::reportRejectedPromises()
-{
-    PromiseRejectMessageQueue& queue = promiseRejectMessageQueue();
-    while (!queue.isEmpty()) {
-        PromiseRejectMessage message = queue.takeFirst();
-        ScriptState* scriptState = message.m_promise.scriptState();
-        if (!scriptState->contextIsValid())
-            continue;
-        // If execution termination has been triggered, quietly bail out.
-        if (v8::V8::IsExecutionTerminating(scriptState->isolate()))
-            continue;
-        ExecutionContext* executionContext = scriptState->executionContext();
-        if (!executionContext)
-            continue;
-
-        ScriptState::Scope scope(scriptState);
-
-        ASSERT(!message.m_promise.isEmpty());
-        v8::Handle<v8::Value> value = message.m_promise.v8Value();
-        ASSERT(!value.IsEmpty() && value->IsPromise());
-        if (v8::Handle<v8::Promise>::Cast(value)->HasHandler())
-            continue;
-
-        const String errorMessage = "Uncaught (in promise)";
-        Vector<ScriptValue> args;
-        args.append(ScriptValue(scriptState, v8String(scriptState->isolate(), errorMessage)));
-        args.append(message.m_exception);
-        RefPtrWillBeRawPtr<ScriptArguments> arguments = ScriptArguments::create(scriptState, args);
-
-        String embedderErrorMessage = message.m_errorMessage;
-        if (embedderErrorMessage.isEmpty()) {
-            embedderErrorMessage = errorMessage;
-        } else {
-            if (embedderErrorMessage.startsWith("Uncaught "))
-                embedderErrorMessage.insert(" (in promise)", 8);
-        }
-
-        RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, embedderErrorMessage, message.m_resourceName, message.m_lineNumber, message.m_columnNumber);
-        consoleMessage->setScriptArguments(arguments);
-        consoleMessage->setCallStack(message.m_callStack);
-        consoleMessage->setScriptId(message.m_scriptId);
-        executionContext->addConsoleMessage(consoleMessage.release());
-    }
+    rejectedPromisesOnMainThread().processQueue();
 }
 
 static void promiseRejectHandlerInMainThread(v8::PromiseRejectMessage data)
 {
     ASSERT(isMainThread());
 
     if (data.GetEvent() != v8::kPromiseRejectWithNoHandler)
         return;
 
     // It's possible that promiseRejectHandlerInMainThread() is invoked while we're initializing a window.
@@ skipping 46 matching lines @@
     } else if (!exception.IsEmpty() && exception->IsInt32()) {
         // For Smi's the message would be empty.
         errorMessage = "Uncaught " + String::number(exception.As<v8::Integer>()->Value());
     }
 
     String messageForConsole = extractMessageForConsole(data.GetValue());
     if (!messageForConsole.isEmpty())
         errorMessage = "Uncaught " + messageForConsole;
 
     ScriptState* scriptState = ScriptState::from(context);
-    promiseRejectMessageQueue().append(PromiseRejectMessage(ScriptValue(scriptState, promise), ScriptValue(scriptState, data.GetValue()), errorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack));
+    rejectedPromisesOnMainThread().add(scriptState, data, errorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack);
 }
 
 static void promiseRejectHandlerInWorker(v8::PromiseRejectMessage data)
 {
     if (data.GetEvent() != v8::kPromiseRejectWithNoHandler)
         return;
 
     v8::Handle<v8::Promise> promise = data.GetPromise();
 
     // Bail out if called during context initialization.
     v8::Isolate* isolate = promise->GetIsolate();
     v8::Handle<v8::Context> context = isolate->GetCurrentContext();
     if (context.IsEmpty())
         return;
 
+    ScriptState* scriptState = ScriptState::from(context);

[haraken, 2015/02/08 01:53:54]

Slightly better:

ScriptState* scriptState = ScriptState::current(isolate);
if (!scriptState->contextIsValid())
    return;

and remove line 279 and 280.

[sof, 2015/02/08 07:26:47]

That looks a bit tidier, thanks. Switched.

+    ExecutionContext* executionContext = scriptState->executionContext();
+    if (!executionContext)
+        return;
+
+    ASSERT(executionContext->isWorkerGlobalScope());
+    WorkerScriptController* scriptController = toWorkerGlobalScope(executionContext)->script();
+    ASSERT(scriptController);
+
     int scriptId = 0;
     int lineNumber = 0;
     int columnNumber = 0;
     String resourceName;
     String errorMessage;
 
     v8::Handle<v8::Message> message = v8::Exception::CreateMessage(data.GetValue());
     if (!message.IsEmpty()) {
         TOSTRING_VOID(V8StringResource<>, resourceName, message->GetScriptOrigin().ResourceName());
         scriptId = message->GetScriptOrigin().ScriptID()->Value();
         lineNumber = message->GetLineNumber();
         columnNumber = message->GetStartColumn() + 1;
         errorMessage = toCoreString(message->Get());
     }
-
-    ScriptState* scriptState = ScriptState::from(context);
-    promiseRejectMessageQueue().append(PromiseRejectMessage(ScriptValue(scriptState, promise), ScriptValue(scriptState, data.GetValue()), errorMessage, resourceName, scriptId, lineNumber, columnNumber, nullptr));
+    scriptController->rejectedPromises()->add(scriptState, data, errorMessage, resourceName, scriptId, lineNumber, columnNumber, nullptr);
 }
 
 static void failedAccessCheckCallbackInMainThread(v8::Local<v8::Object> host, v8::AccessType type, v8::Local<v8::Value> data)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     Frame* target = findFrame(host, data, isolate);
     if (!target)
         return;
     DOMWindow* targetWindow = target->domWindow();
 
@@ skipping 49 matching lines @@
 static void initializeV8Common(v8::Isolate* isolate)
 {
     v8::V8::AddGCPrologueCallback(V8GCController::gcPrologue);
     v8::V8::AddGCEpilogueCallback(V8GCController::gcEpilogue);
 
     v8::Debug::SetLiveEditEnabled(isolate, false);
 
     isolate->SetAutorunMicrotasks(false);
 }
 
+namespace {
+
+class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+    virtual void* Allocate(size_t size) override
+    {
+        void* data;
+        WTF::ArrayBufferContents::allocateMemory(size, WTF::ArrayBufferContents::ZeroInitialize, data);
+        return data;
+    }
+
+    virtual void* AllocateUninitialized(size_t size) override
+    {
+        void* data;
+        WTF::ArrayBufferContents::allocateMemory(size, WTF::ArrayBufferContents::DontInitialize, data);
+        return data;
+    }
+
+    virtual void Free(void* data, size_t size) override
+    {
+        WTF::ArrayBufferContents::freeMemory(data, size);
+    }
+};
+
+} // namespace
+
 void V8Initializer::initializeMainThreadIfNeeded()
 {
     ASSERT(isMainThread());
 
     static bool initialized = false;
     if (initialized)
         return;
     initialized = true;
 
     DEFINE_STATIC_LOCAL(ArrayBufferAllocator, arrayBufferAllocator, ());
@@ skipping 66 matching lines @@
 
     v8::V8::AddMessageListener(messageHandlerInWorker);
     v8::V8::SetFatalErrorHandler(reportFatalErrorInWorker);
 
     uint32_t here;
     isolate->SetStackLimit(reinterpret_cast<uintptr_t>(&here - kWorkerMaxStackSize / sizeof(uint32_t*)));
     isolate->SetPromiseRejectCallback(promiseRejectHandlerInWorker);
 }
 
 } // namespace blink