Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Unified Diff: third_party/WebKit/Source/core/frame/FrameConsole.cpp

Issue 2151273003: [DevTools] Move browser logging from Console domain to Log domain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internals-method
Patch Set: protocol improvements Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/FrameConsole.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameConsole.cpp b/third_party/WebKit/Source/core/frame/FrameConsole.cpp
index ad42cc6981e17df4d26ce5ebc73f67adda6c73c8..65712828edbfe5286fb3c02349d57216c1d32c85 100644
--- a/third_party/WebKit/Source/core/frame/FrameConsole.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameConsole.cpp
@@ -31,6 +31,7 @@
#include "bindings/core/v8/SourceLocation.h"
#include "core/frame/FrameHost.h"
#include "core/inspector/ConsoleMessage.h"
+#include "core/inspector/ConsoleMessageStorage.h"
#include "core/inspector/MainThreadDebugger.h"
#include "core/page/ChromeClient.h"
#include "core/page/Page.h"
@@ -54,10 +55,9 @@ void FrameConsole::addMessage(ConsoleMessage* consoleMessage)
bool FrameConsole::addMessageToStorage(ConsoleMessage* consoleMessage)
{
- // TODO(dgozman): drop this check, it's left here to preserve tests output.
- if (!m_frame->document())
+ if (!m_frame->document() || !m_frame->host())
return false;
- return MainThreadDebugger::instance()->addConsoleMessage(m_frame, consoleMessage);
+ return m_frame->host()->consoleMessageStorage().addConsoleMessage(m_frame->document(), consoleMessage);
}
void FrameConsole::reportMessageToClient(ConsoleMessage* consoleMessage)
@@ -68,19 +68,19 @@ void FrameConsole::reportMessageToClient(ConsoleMessage* consoleMessage)
String url = consoleMessage->location()->url();
String stackTrace;
if (consoleMessage->source() == ConsoleAPIMessageSource) {
- if (!frame().host())
+ if (!m_frame->host())
return;
- if (frame().chromeClient().shouldReportDetailedMessageForSource(frame(), url)) {
+ if (m_frame->chromeClient().shouldReportDetailedMessageForSource(*m_frame, url)) {
std::unique_ptr<SourceLocation> location = SourceLocation::captureWithFullStackTrace();
if (!location->isUnknown())
stackTrace = location->toString();
}
} else {
- if (!consoleMessage->location()->isUnknown() && frame().chromeClient().shouldReportDetailedMessageForSource(frame(), url))
+ if (!consoleMessage->location()->isUnknown() && m_frame->chromeClient().shouldReportDetailedMessageForSource(*m_frame, url))
stackTrace = consoleMessage->location()->toString();
}
- frame().chromeClient().addMessageToConsole(m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->location()->lineNumber(), url, stackTrace);
+ m_frame->chromeClient().addMessageToConsole(m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->location()->lineNumber(), url, stackTrace);
}
void FrameConsole::addMessageFromWorker(ConsoleMessage* consoleMessage, const String& workerId)

Powered by Google App Engine
This is Rietveld 408576698