Use SourceLocation when reporting runtime exceptions.

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/ScriptCallStack.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.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 "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;
 
 class RejectedPromises::Message final {
 public:
-    static PassOwnPtr<Message> create(ScriptState* scriptState, v8::Local<v8::Promise> promise, v8::Local<v8::Value> exception, const String& errorMessage, const String& resourceName, int scriptId, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> callStack, AccessControlStatus corsStatus)
+    static PassOwnPtr<Message> create(ScriptState* scriptState, v8::Local<v8::Promise> promise, v8::Local<v8::Value> exception, const String& errorMessage, PassOwnPtr<SourceLocation> location, AccessControlStatus corsStatus)
     {
-        return adoptPtr(new Message(scriptState, promise, exception, errorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack, corsStatus));
+        return adoptPtr(new Message(scriptState, promise, exception, errorMessage, std::move(location), corsStatus));
     }
 
     bool isCollected()
     {
         return m_collected || !m_scriptState->contextIsValid();
     }
 
     bool hasPromise(v8::Local<v8::Value> promise)
     {
         ScriptState::Scope scope(m_scriptState);
@@ skipping 36 matching lines @@
             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, m_resourceName, m_lineNumber, m_columnNumber, m_callStack, m_scriptId, arguments);
+            ConsoleMessage* consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, embedderErrorMessage, std::move(m_location), arguments);
             m_consoleMessageId = consoleMessage->assignMessageId();
             executionContext->addConsoleMessage(consoleMessage);
         }
 
-        m_callStack.clear();
+        m_location.clear();
     }
 
     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());
@@ skipping 34 matching lines @@
 
     bool hasHandler()
     {
         ASSERT(!isCollected());
         ScriptState::Scope scope(m_scriptState);
         v8::Local<v8::Value> value = m_promise.newLocal(m_scriptState->isolate());
         return v8::Local<v8::Promise>::Cast(value)->HasHandler();
     }
 
 private:
-    Message(ScriptState* scriptState, v8::Local<v8::Promise> promise, v8::Local<v8::Value> exception, const String& errorMessage, const String& resourceName, int scriptId, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> callStack, AccessControlStatus corsStatus)
+    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(resourceName)
-        , m_scriptId(scriptId)
-        , m_lineNumber(lineNumber)
-        , m_columnNumber(columnNumber)
-        , m_callStack(callStack)
+        , m_resourceName(location->url())
+        , m_location(std::move(location))
         , m_consoleMessageId(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;
-    int m_scriptId;
-    int m_lineNumber;
-    int m_columnNumber;
-    RefPtr<ScriptCallStack> m_callStack;
+    OwnPtr<SourceLocation> m_location;
     unsigned m_consoleMessageId;
     bool m_collected;
     bool m_shouldLogToConsole;
     AccessControlStatus m_corsStatus;
 };
 
 RejectedPromises::RejectedPromises()
 {
 }
 
 RejectedPromises::~RejectedPromises()
 {
 }
 
-void RejectedPromises::rejectedWithNoHandler(ScriptState* scriptState, v8::PromiseRejectMessage data, const String& errorMessage, const String& resourceName, int scriptId, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> callStack, AccessControlStatus corsStatus)
+void RejectedPromises::rejectedWithNoHandler(ScriptState* scriptState, v8::PromiseRejectMessage data, const String& errorMessage, PassOwnPtr<SourceLocation> location, AccessControlStatus corsStatus)
 {
-    m_queue.append(Message::create(scriptState, data.GetPromise(), data.GetValue(), errorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack, corsStatus));
+    m_queue.append(Message::create(scriptState, data.GetPromise(), data.GetValue(), errorMessage, std::move(location), corsStatus));
 }
 
 void RejectedPromises::handlerAdded(v8::PromiseRejectMessage data)
 {
     // First look it up in the pending messages and fast return, it'll be covered by processQueue().
     for (auto it = m_queue.begin(); it != m_queue.end(); ++it) {
         if (!(*it)->isCollected() && (*it)->hasPromise(data.GetPromise())) {
             m_queue.remove(it);
             return;
         }
@@ skipping 59 matching lines @@
         }
     }
 }
 
 void RejectedPromises::revokeNow(PassOwnPtr<Message> message)
 {
     message->revoke();
 }
 
 } // namespace blink