[DevTools] Move Console to v8 inspector.

third_party/WebKit/Source/bindings/core/v8/RejectedPromises.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/RejectedPromises.h"
 
 #include "bindings/core/v8/ScopedPersistent.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
+#include "bindings/core/v8/V8PerIsolateData.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/EventTarget.h"
 #include "core/events/PromiseRejectionEvent.h"
-#include "core/inspector/ConsoleMessage.h"
-#include "core/inspector/ScriptArguments.h"
+#include "core/inspector/ThreadDebugger.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebTaskRunner.h"
 #include "public/platform/WebThread.h"
 #include "wtf/Functional.h"
 
 namespace blink {
 
 static const unsigned maxReportedHandlersPendingResolution = 1000;
@@ skipping 40 matching lines @@
             PromiseRejectionEventInit init;
             init.setPromise(ScriptPromise(m_scriptState, value));
             init.setReason(ScriptValue(m_scriptState, reason));
             init.setCancelable(true);
             PromiseRejectionEvent* event = PromiseRejectionEvent::create(m_scriptState, EventTypeNames::unhandledrejection, init);
             // Log to console if event was not canceled.
             m_shouldLogToConsole = target->dispatchEvent(event) == DispatchEventResult::NotCanceled;
         }
 
         if (m_shouldLogToConsole) {
-            const String errorMessage = "Uncaught (in promise)";
-            Vector<ScriptValue> args;
-            args.append(ScriptValue(m_scriptState, v8String(m_scriptState->isolate(), errorMessage)));
-            args.append(ScriptValue(m_scriptState, reason));
-            ScriptArguments* arguments = ScriptArguments::create(m_scriptState, args);
-
-            String embedderErrorMessage = m_errorMessage;
-            if (embedderErrorMessage.isEmpty())
-                embedderErrorMessage = errorMessage;
-            else if (embedderErrorMessage.startsWith("Uncaught "))
-                embedderErrorMessage.insert(" (in promise)", 8);
-
-            ConsoleMessage* consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, embedderErrorMessage, std::move(m_location), arguments);
-            m_consoleMessageId = consoleMessage->assignMessageId();
-            executionContext->addConsoleMessage(consoleMessage);
+            V8PerIsolateData* data = V8PerIsolateData::from(m_scriptState->isolate());
+            if (data->threadDebugger())
+                m_promiseRejectionId = data->threadDebugger()->debugger()->promiseRejected(m_scriptState->context(), m_errorMessage, reason, m_location->url(), m_location->lineNumber(), m_location->columnNumber(), m_location->cloneStackTrace(), m_location->scriptId());
         }
 
         m_location.reset();
     }
 
     void revoke()
     {
         ExecutionContext* executionContext = m_scriptState->getExecutionContext();
         if (!executionContext)
             return;
 
         ScriptState::Scope scope(m_scriptState);
         v8::Local<v8::Value> value = m_promise.newLocal(m_scriptState->isolate());
         v8::Local<v8::Value> reason = m_exception.newLocal(m_scriptState->isolate());
         // Either collected or https://crbug.com/450330
         if (value.IsEmpty() || !value->IsPromise())
             return;
 
         EventTarget* target = executionContext->errorEventTarget();
         if (RuntimeEnabledFeatures::promiseRejectionEventEnabled() && target && !executionContext->shouldSanitizeScriptError(m_resourceName, m_corsStatus)) {
             PromiseRejectionEventInit init;
             init.setPromise(ScriptPromise(m_scriptState, value));
             init.setReason(ScriptValue(m_scriptState, reason));
             PromiseRejectionEvent* event = PromiseRejectionEvent::create(m_scriptState, EventTypeNames::rejectionhandled, init);
             target->dispatchEvent(event);
         }
 
-        if (m_shouldLogToConsole) {
-            ConsoleMessage* consoleMessage = ConsoleMessage::create(JSMessageSource, RevokedErrorMessageLevel, "Handler added to rejected promise");
-            consoleMessage->setRelatedMessageId(m_consoleMessageId);
-            executionContext->addConsoleMessage(consoleMessage);
+        if (m_shouldLogToConsole && m_promiseRejectionId) {
+            V8PerIsolateData* data = V8PerIsolateData::from(m_scriptState->isolate());
+            if (data->threadDebugger())
+                data->threadDebugger()->debugger()->promiseRejectionRevoked(m_scriptState->context(), m_promiseRejectionId);
         }
     }
 
     void makePromiseWeak()
     {
         ASSERT(!m_promise.isEmpty() && !m_promise.isWeak());
         m_promise.setWeak(this, &Message::didCollectPromise);
         m_exception.setWeak(this, &Message::didCollectException);
     }
 
@@ skipping 13 matching lines @@
     }
 
 private:
     Message(ScriptState* scriptState, v8::Local<v8::Promise> promise, v8::Local<v8::Value> exception, const String& errorMessage, PassOwnPtr<SourceLocation> location, AccessControlStatus corsStatus)
         : m_scriptState(scriptState)
         , m_promise(scriptState->isolate(), promise)
         , m_exception(scriptState->isolate(), exception)
         , m_errorMessage(errorMessage)
         , m_resourceName(location->url())
         , m_location(std::move(location))
-        , m_consoleMessageId(0)
+        , m_promiseRejectionId(0)
         , m_collected(false)
         , m_shouldLogToConsole(true)
         , m_corsStatus(corsStatus)
     {
     }
 
     static void didCollectPromise(const v8::WeakCallbackInfo<Message>& data)
     {
         data.GetParameter()->m_collected = true;
         data.GetParameter()->m_promise.clear();
     }
 
     static void didCollectException(const v8::WeakCallbackInfo<Message>& data)
     {
         data.GetParameter()->m_exception.clear();
     }
 
     ScriptState* m_scriptState;
     ScopedPersistent<v8::Promise> m_promise;
     ScopedPersistent<v8::Value> m_exception;
     String m_errorMessage;
     String m_resourceName;
     OwnPtr<SourceLocation> m_location;
-    unsigned m_consoleMessageId;
+    unsigned m_promiseRejectionId;
     bool m_collected;
     bool m_shouldLogToConsole;
     AccessControlStatus m_corsStatus;
 };
 
 RejectedPromises::RejectedPromises()
 {
 }
 
 RejectedPromises::~RejectedPromises()
@@ skipping 75 matching lines @@
         }
     }
 }
 
 void RejectedPromises::revokeNow(PassOwnPtr<Message> message)
 {
     message->revoke();
 }
 
 } // namespace blink