[DevTools] ConsoleAPI messages pass through frame console

Source/core/frame/ConsoleBase.cpp

 /*
  * Copyright (C) 2007 Apple 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 67 matching lines @@
     internalAddMessage(DirXMLMessageType, LogMessageLevel, scriptState, arguments);
 }
 
 void ConsoleBase::table(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
 {
     internalAddMessage(TableMessageType, LogMessageLevel, scriptState, arguments);
 }
 
 void ConsoleBase::clear(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
 {
-    InspectorInstrumentation::addConsoleAPIMessageToConsole(context(), ClearMessageType, LogMessageLevel, String(), scriptState, arguments);
+    internalAddMessage(ClearMessageType, LogMessageLevel, scriptState, arguments, true);
 }
 
 void ConsoleBase::trace(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
 {
     internalAddMessage(TraceMessageType, LogMessageLevel, scriptState, arguments, true, true);
 }
 
 void ConsoleBase::assertCondition(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, bool condition)
 {
     if (condition)
@@ skipping 46 matching lines @@
     InspectorInstrumentation::consoleTimeline(context(), title, scriptState);
 }
 
 void ConsoleBase::timelineEnd(ScriptState* scriptState, const String& title)
 {
     InspectorInstrumentation::consoleTimelineEnd(context(), title, scriptState);
 }
 
 void ConsoleBase::group(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
 {
-    InspectorInstrumentation::addConsoleAPIMessageToConsole(context(), StartGroupMessageType, LogMessageLevel, String(), scriptState, arguments);
+    internalAddMessage(StartGroupMessageType, LogMessageLevel, scriptState, arguments, true);
 }
 
 void ConsoleBase::groupCollapsed(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
 {
-    InspectorInstrumentation::addConsoleAPIMessageToConsole(context(), StartGroupCollapsedMessageType, LogMessageLevel, String(), scriptState, arguments);
+    internalAddMessage(StartGroupCollapsedMessageType, LogMessageLevel, scriptState, arguments, true);
 }
 
 void ConsoleBase::groupEnd()
 {
-    InspectorInstrumentation::addConsoleAPIMessageToConsole(context(), EndGroupMessageType, LogMessageLevel, String(), nullptr, nullptr);
+    internalAddMessage(EndGroupMessageType, LogMessageLevel, nullptr, nullptr, true);
 }
 
 void ConsoleBase::internalAddMessage(MessageType type, MessageLevel level, ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> scriptArguments, bool acceptNoArguments, bool printTrace)
 {
-    if (!context())
+    RefPtrWillBeRawPtr<ScriptArguments> arguments = scriptArguments;
+    if (!acceptNoArguments && (!arguments || !arguments->argumentCount()))
         return;
 
-    RefPtrWillBeRawPtr<ScriptArguments> arguments = scriptArguments;
-    if (!acceptNoArguments && !arguments->argumentCount())
-        return;
+    String message;
+    bool gotStringMessage = arguments ? arguments->getFirstArgumentAsString(message) : false;
+
+    RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, level, gotStringMessage? message : String());
+    consoleMessage->setType(type);
+    consoleMessage->setScriptState(scriptState);
+    consoleMessage->setScriptArguments(arguments);
 
     size_t stackSize = printTrace ? ScriptCallStack::maxCallStackSizeToCapture : 1;
     RefPtrWillBeRawPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(stackSize));
+    consoleMessage->setCallStack(callStack);
 
-    String message;
-    bool gotStringMessage = arguments->getFirstArgumentAsString(message);
-    InspectorInstrumentation::addConsoleAPIMessageToConsole(context(), type, level, message, scriptState, arguments);
-    if (gotStringMessage)
-        reportMessageToClient(level, message, callStack);
+    reportMessageToConsole(consoleMessage.release());
 }
 
 } // namespace blink