[DevTools] Pass error object when reporting exceptions.

third_party/WebKit/Source/core/dom/ExecutionContext.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2012 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
@@ skipping 26 matching lines @@
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
-class ExecutionContext::PendingException {
-    WTF_MAKE_NONCOPYABLE(PendingException);
-public:
-    PendingException(const String& errorMessage, std::unique_ptr<SourceLocation> location)
-        : m_errorMessage(errorMessage)
-        , m_location(std::move(location))
-    {
-    }
-
-    String m_errorMessage;
-    std::unique_ptr<SourceLocation> m_location;
-};
-
 ExecutionContext::ExecutionContext()
     : m_circularSequentialID(0)
     , m_inDispatchErrorEvent(false)
     , m_activeDOMObjectsAreSuspended(false)
     , m_activeDOMObjectsAreStopped(false)
     , m_windowInteractionTokens(0)
     , m_isRunSuspendableTasksScheduled(false)
     , m_referrerPolicy(ReferrerPolicyDefault)
 {
 }
@@ skipping 68 matching lines @@
 bool ExecutionContext::shouldSanitizeScriptError(const String& sourceURL, AccessControlStatus corsStatus)
 {
     if (corsStatus == OpaqueResource)
         return true;
     return !(getSecurityOrigin()->canRequestNoSuborigin(completeURL(sourceURL)) || corsStatus == SharableCrossOrigin);
 }
 
 void ExecutionContext::reportException(ErrorEvent* errorEvent, AccessControlStatus corsStatus)
 {
     if (m_inDispatchErrorEvent) {
-        if (!m_pendingExceptions)
-            m_pendingExceptions = wrapUnique(new Vector<std::unique_ptr<PendingException>>());
-        m_pendingExceptions->append(wrapUnique(new PendingException(errorEvent->messageForConsole(), errorEvent->location()->clone())));
+        m_pendingExceptions.append(errorEvent);
         return;
     }
 
     // First report the original exception and only then all the nested ones.
     if (!dispatchErrorEvent(errorEvent, corsStatus))
-        exceptionThrown(errorEvent->messageForConsole(), errorEvent->location()->clone());
+        exceptionThrown(errorEvent);
 
-    if (!m_pendingExceptions)
+    if (m_pendingExceptions.isEmpty())
         return;
-
-    for (size_t i = 0; i < m_pendingExceptions->size(); i++) {
-        PendingException* e = m_pendingExceptions->at(i).get();
-        exceptionThrown(e->m_errorMessage, std::move(e->m_location));
-    }
-    m_pendingExceptions.reset();
+    for (ErrorEvent* e : m_pendingExceptions)
+        exceptionThrown(e);
+    m_pendingExceptions.clear();
 }
 
 bool ExecutionContext::dispatchErrorEvent(ErrorEvent* errorEvent, AccessControlStatus corsStatus)
 {
     EventTarget* target = errorEventTarget();
     if (!target)
         return false;
 
     if (shouldSanitizeScriptError(errorEvent->filename(), corsStatus))
         errorEvent = ErrorEvent::createSanitizedError(errorEvent->world());
@@ skipping 110 matching lines @@
 }
 
 void ExecutionContext::removeURLFromMemoryCache(const KURL& url)
 {
     memoryCache()->removeURLFromCache(url);
 }
 
 DEFINE_TRACE(ExecutionContext)
 {
     visitor->trace(m_publicURLManager);
+    visitor->trace(m_pendingExceptions);
     ContextLifecycleNotifier::trace(visitor);
     Supplementable<ExecutionContext>::trace(visitor);
 }
 
 } // namespace blink