DevTools: Make FrameConsole methods accept ConsoleMessage objects.

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 16 matching lines @@
 
 #include "config.h"
 #include "core/dom/ExecutionContext.h"
 
 #include "core/dom/AddConsoleMessageTask.h"
 #include "core/dom/ContextLifecycleNotifier.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/events/ErrorEvent.h"
 #include "core/events/EventTarget.h"
 #include "core/html/PublicURLManager.h"
+#include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "wtf/MainThread.h"
 
 namespace WebCore {
 
 class ExecutionContext::PendingException : public NoBaseWillBeGarbageCollectedFinalized<ExecutionContext::PendingException> {
     WTF_MAKE_NONCOPYABLE(PendingException);
 public:
-    PendingException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
-        : m_errorMessage(errorMessage)
-        , m_lineNumber(lineNumber)
-        , m_columnNumber(columnNumber)
-        , m_sourceURL(sourceURL)
-        , m_callStack(callStack)
+    PendingException(PassRefPtr<ConsoleMessage> consoleMessage)
+        : m_consoleMessage(consoleMessage)
     {
     }
     void trace(Visitor* visitor)
     {
-        visitor->trace(m_callStack);
+        visitor->trace(m_consoleMessage);
     }
-    String m_errorMessage;
-    int m_lineNumber;
-    int m_columnNumber;
-    String m_sourceURL;
-    RefPtrWillBeMember<ScriptCallStack> m_callStack;
+    RefPtr<ConsoleMessage> m_consoleMessage;
 };
 
 ExecutionContext::ExecutionContext()
     : m_client(0)
     , m_sandboxFlags(SandboxNone)
     , m_circularSequentialID(0)
     , m_inDispatchErrorEvent(false)
     , m_activeDOMObjectsAreSuspended(false)
     , m_activeDOMObjectsAreStopped(false)
 {
@@ skipping 51 matching lines @@
     // Ensure all ActiveDOMObjects are suspended also newly created ones.
     if (m_activeDOMObjectsAreSuspended)
         object->suspend();
 }
 
 bool ExecutionContext::shouldSanitizeScriptError(const String& sourceURL, AccessControlStatus corsStatus)
 {
     return !(securityOrigin()->canRequest(completeURL(sourceURL)) || corsStatus == SharableCrossOrigin);
 }
 
-void ExecutionContext::reportException(PassRefPtrWillBeRawPtr<ErrorEvent> event, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, AccessControlStatus corsStatus)
+void ExecutionContext::reportException(PassRefPtrWillBeRawPtr<ErrorEvent> event, PassRefPtr<ConsoleMessage> prpConsoleMessage)
 {
     RefPtrWillBeRawPtr<ErrorEvent> errorEvent = event;
+    RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
+
     if (m_inDispatchErrorEvent) {
         if (!m_pendingExceptions)
             m_pendingExceptions = adoptPtrWillBeNoop(new WillBeHeapVector<OwnPtrWillBeMember<PendingException> >());
-        m_pendingExceptions->append(adoptPtrWillBeNoop(new PendingException(errorEvent->messageForConsole(), errorEvent->lineno(), errorEvent->colno(), errorEvent->filename(), callStack)));
+        m_pendingExceptions->append(adoptPtrWillBeNoop(new PendingException(consoleMessage.release())));
         return;
     }
 
+    AccessControlStatus corsStatus = consoleMessage->corsStatus();

[vsevik, 2014/07/15 14:43:22]

corsStatus is only used for event dispatching, so we should not put it inside
the ConsoleMessage object.

     // First report the original exception and only then all the nested ones.
-    if (!dispatchErrorEvent(errorEvent, corsStatus) && m_client)
-        m_client->logExceptionToConsole(errorEvent->messageForConsole(), errorEvent->filename(), errorEvent->lineno(), errorEvent->colno(), callStack);
+    if (!dispatchErrorEvent(errorEvent, corsStatus) && m_client /* redundancy check */) {
+        consoleMessage->setMessage(errorEvent->messageForConsole());
+        consoleMessage->setURL(errorEvent->filename());
+        m_client->logExceptionToConsole(consoleMessage.release());
+    }
 
     if (!m_pendingExceptions)
         return;
 
     for (size_t i = 0; i < m_pendingExceptions->size(); i++) {
         PendingException* e = m_pendingExceptions->at(i).get();
         if (m_client)
-            m_client->logExceptionToConsole(e->m_errorMessage, e->m_sourceURL, e->m_lineNumber, e->m_columnNumber, e->m_callStack);
+            m_client->logExceptionToConsole(e->m_consoleMessage);
     }
     m_pendingExceptions.clear();
 }
 
 void ExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber)
 {
     if (!m_client)
         return;
-    m_client->addMessage(source, level, message, sourceURL, lineNumber, 0);
+    m_client->addMessage(ConsoleMessage::create(source, level, message, sourceURL, lineNumber));
 }
 
-void ExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, ScriptState* scriptState)
+void ExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack)
 {
     if (!m_client)
         return;
-    m_client->addMessage(source, level, message, String(), 0, scriptState);
+    m_client->addMessage(ConsoleMessage::create(source, level, message, callStack));
 }
 
 bool ExecutionContext::dispatchErrorEvent(PassRefPtrWillBeRawPtr<ErrorEvent> event, AccessControlStatus corsStatus)
 {
     if (!m_client)
         return false;
     EventTarget* target = m_client->errorEventTarget();
     if (!target)
         return false;
 
@@ skipping 149 matching lines @@
 
 void ExecutionContext::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingExceptions);
 #endif
     Supplementable<WebCore::ExecutionContext>::trace(visitor);
 }
 
 } // namespace WebCore