[DevTools] ConsoleAPI messages pass through frame console

Source/core/frame/FrameConsole.cpp

 /*
  * Copyright (C) 2013 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 11 matching lines @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/frame/FrameConsole.h"
 
+#include "bindings/core/v8/ScriptCallStackFactory.h"
 #include "core/frame/FrameHost.h"
 #include "core/inspector/ConsoleAPITypes.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "core/workers/WorkerGlobalScopeProxy.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 namespace {
 
 int muteCount = 0;
 
 }
 
 FrameConsole::FrameConsole(LocalFrame& frame)
     : m_frame(frame)
 {
 }
 
 void FrameConsole::addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleMessage)
 {
-    if (muteCount)
+    if (muteCount && prpConsoleMessage->source() != ConsoleAPIMessageSource)

[vsevik, 2014/08/18 18:41:06]

You should never use prp* parameters as is.

[kozyatinskiy1, 2014/08/19 07:31:06]

Done.

         return;
 
     // FIXME: This should not need to reach for the main-frame.
     // Inspector code should just take the current frame and know how to walk itself.
     ExecutionContext* context = m_frame.document();
     if (!context)
         return;
 
     RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
     InspectorInstrumentation::addMessageToConsole(context, consoleMessage.get());
 
-    String messageURL;
-    if (consoleMessage->callStack())
-        messageURL = consoleMessage->callStack()->at(0).sourceURL();
-    else
-        messageURL = consoleMessage->url();
-
     if (consoleMessage->source() == CSSMessageSource)
         return;
 
+    String messageURL;
+    unsigned lineNumber = 0;
+    if (consoleMessage->callStack()) {
+        lineNumber = consoleMessage->callStack()->at(0).lineNumber();
+        messageURL = consoleMessage->callStack()->at(0).sourceURL();
+    } else {
+        lineNumber = consoleMessage->lineNumber();
+        messageURL = consoleMessage->url();
+    }
+
+    RefPtr<ScriptCallStack> reportedCallStack;
+    if (consoleMessage->source() != ConsoleAPIMessageSource) {
+        if (consoleMessage->callStack() && m_frame.chromeClient().shouldReportDetailedMessageForSource(messageURL))
+            reportedCallStack = consoleMessage->callStack();
+    } else {
+        if (!m_frame.host() || (consoleMessage->scriptArguments() && consoleMessage->scriptArguments()->argumentCount() == 0))
+            return;
+
+        MessageType type = consoleMessage->type();
+        if (type == StartGroupMessageType || type == EndGroupMessageType || type == StartGroupCollapsedMessageType)
+            return;
+
+        if (m_frame.chromeClient().shouldReportDetailedMessageForSource(messageURL))
+            reportedCallStack = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture);
+    }
+
     String stackTrace;
-    if (consoleMessage->callStack() && m_frame.chromeClient().shouldReportDetailedMessageForSource(consoleMessage->url()))
-        stackTrace = FrameConsole::formatStackTraceString(consoleMessage->message(), consoleMessage->callStack());
-
-    m_frame.chromeClient().addMessageToConsole(&m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), messageURL, stackTrace);
+    if (reportedCallStack)
+        stackTrace = FrameConsole::formatStackTraceString(consoleMessage->message(), reportedCallStack);
+    m_frame.chromeClient().addMessageToConsole(&m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), lineNumber, messageURL, stackTrace);
 }
 
 String FrameConsole::formatStackTraceString(const String& originalMessage, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
 {
     StringBuilder stackTrace;
     for (size_t i = 0; i < callStack->size(); ++i) {
         const ScriptCallFrame& frame = callStack->at(i);
         stackTrace.append("\n    at " + (frame.functionName().length() ? frame.functionName() : "(anonymous function)"));
         stackTrace.append(" (");
         stackTrace.append(frame.sourceURL());
@@ skipping 17 matching lines @@
     ASSERT(muteCount > 0);
     muteCount--;
 }
 
 void FrameConsole::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy)
 {
     InspectorInstrumentation::adoptWorkerConsoleMessages(m_frame.document(), proxy);
 }
 
 } // namespace blink