[DevTools] ConsoleAPI messages pass through frame console

Source/core/inspector/InspectorConsoleAgent.cpp

 /*
  * Copyright (C) 2011 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
@@ skipping 152 matching lines @@
 
 void InspectorConsoleAgent::clearFrontend()
 {
     m_frontend = 0;
     String errorString;
     disable(&errorString);
 }
 
 void InspectorConsoleAgent::addMessageToConsole(ConsoleMessage* consoleMessage)
 {
+    if (consoleMessage->type() == ClearMessageType) {
+        ErrorString error;
+        clearMessages(&error);
+    }
+
     InspectorConsoleMessage* message;
-    if (consoleMessage->callStack()) {
+    if (consoleMessage->source() == ConsoleAPIMessageSource) {
+        message = new InspectorConsoleMessage(consoleMessage->source(), consoleMessage->type(), consoleMessage->level(), consoleMessage->message(), consoleMessage->scriptArguments(), consoleMessage->scriptState());
+    } else if (consoleMessage->callStack()) {
         message = new InspectorConsoleMessage(consoleMessage->source(), LogMessageType, consoleMessage->level(), consoleMessage->message(), consoleMessage->callStack(), consoleMessage->requestIdentifier());
     } else {
         bool shouldGenerateCallStack = m_frontend;
         message = new InspectorConsoleMessage(shouldGenerateCallStack, consoleMessage->source(), LogMessageType, consoleMessage->level(), consoleMessage->message(), consoleMessage->url(), consoleMessage->lineNumber(), consoleMessage->columnNumber(), consoleMessage->scriptState(), consoleMessage->requestIdentifier());
     }
     message->setWorkerGlobalScopeProxy(consoleMessage->workerId());
     addConsoleMessage(adoptPtr(message));
 }
 
 void InspectorConsoleAgent::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy)
 {
     for (size_t i = 0; i < m_consoleMessages.size(); i++) {
         if (m_consoleMessages[i]->workerGlobalScopeProxy() == proxy)
             m_consoleMessages[i]->setWorkerGlobalScopeProxy(nullptr);
     }
 }
 
-void InspectorConsoleAgent::addConsoleAPIMessageToConsole(MessageType type, MessageLevel level, const String& message, ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
-{
-    if (type == ClearMessageType) {
-        ErrorString error;
-        clearMessages(&error);
-    }
-
-    addConsoleMessage(adoptPtr(new InspectorConsoleMessage(ConsoleAPIMessageSource, type, level, message, arguments, scriptState, requestIdentifier)));
-}
-
 Vector<unsigned> InspectorConsoleAgent::consoleMessageArgumentCounts()
 {
     Vector<unsigned> result(m_consoleMessages.size());
     for (size_t i = 0; i < m_consoleMessages.size(); i++)
         result[i] = m_consoleMessages[i]->argumentCount();
     return result;
 }
 
 void InspectorConsoleAgent::consoleTime(ExecutionContext*, const String& title)
 {
@@ skipping 14 matching lines @@
 
     HashMap<String, double>::iterator it = m_times.find(title);
     if (it == m_times.end())
         return;
 
     double startTime = it->value;
     m_times.remove(it);
 
     double elapsed = monotonicallyIncreasingTime() - startTime;
     String message = title + String::format(": %.3fms", elapsed * 1000);
-    addConsoleAPIMessageToConsole(LogMessageType, DebugMessageLevel, message, scriptState, nullptr);
+
+    RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, DebugMessageLevel, message);
+    consoleMessage->setType(LogMessageType);
+    consoleMessage->setScriptState(scriptState);
+    addMessageToConsole(consoleMessage.get());
 }
 
 void InspectorConsoleAgent::setTracingBasedTimeline(ErrorString*, bool enabled)
 {
     m_state->setBoolean(ConsoleAgentState::tracingBasedTimeline, enabled);
 }
 
 void InspectorConsoleAgent::consoleTimeline(ExecutionContext* context, const String& title, ScriptState* scriptState)
 {
     UseCounter::count(context, UseCounter::DevToolsConsoleTimeline);
@@ skipping 17 matching lines @@
     const ScriptCallFrame& lastCaller = callStack->at(0);
     // Follow Firebug's behavior of counting with null and undefined title in
     // the same bucket as no argument
     String title;
     arguments->getFirstArgumentAsString(title);
     String identifier = title.isEmpty() ? String(lastCaller.sourceURL() + ':' + String::number(lastCaller.lineNumber()))
                                         : String(title + '@');
 
     HashCountedSet<String>::AddResult result = m_counts.add(identifier);
     String message = title + ": " + String::number(result.storedValue->value);
-    addConsoleAPIMessageToConsole(LogMessageType, DebugMessageLevel, message, scriptState, nullptr);
+
+    RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, DebugMessageLevel, message);
+    consoleMessage->setType(LogMessageType);
+    consoleMessage->setScriptState(scriptState);
+    addMessageToConsole(consoleMessage.get());
 }
 
 void InspectorConsoleAgent::frameWindowDiscarded(LocalDOMWindow* window)
 {
     size_t messageCount = m_consoleMessages.size();
     for (size_t i = 0; i < messageCount; ++i)
         m_consoleMessages[i]->windowCleared(window);
     m_injectedScriptManager->discardInjectedScriptsFor(window);
 }
 
@@ skipping 71 matching lines @@
 private:
     int m_heapObjectId;
 };
 
 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId)
 {
     m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(new InspectableHeapObject(inspectedHeapObjectId)));
 }
 
 } // namespace blink