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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1890513004: Remove dependency on the DevTools agent for console logs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 4a1b6f93e2d16a899f2d54a0f0c1a2ffc38e3a16..d59743b3cddb4e4bc8781a4f2d45d661fa060c10 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -164,6 +164,7 @@
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/platform/modules/webusb/WebUSBClient.h"
#include "third_party/WebKit/public/web/WebColorSuggestion.h"
+#include "third_party/WebKit/public/web/WebConsoleMessage.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFindOptions.h"
#include "third_party/WebKit/public/web/WebFrameSerializer.h"
@@ -793,6 +794,22 @@ bool UseMojoCdm() {
}
#endif // defined(ENABLE_MOJO_CDM)
+blink::WebConsoleMessage::Level translateConsoleLevel(
nasko 2016/04/14 14:14:44 Start with capital T, since this is Chromium code.
carlosk 2016/04/14 15:28:03 Done.
+ const ConsoleMessageLevel level) {
+ switch (level) {
+ case CONSOLE_MESSAGE_LEVEL_DEBUG:
+ return blink::WebConsoleMessage::LevelDebug;
+ case CONSOLE_MESSAGE_LEVEL_LOG:
+ return blink::WebConsoleMessage::LevelLog;
+ case CONSOLE_MESSAGE_LEVEL_WARNING:
+ return blink::WebConsoleMessage::LevelWarning;
+ case CONSOLE_MESSAGE_LEVEL_ERROR:
+ return blink::WebConsoleMessage::LevelError;
+ }
+ NOTREACHED();
+ return blink::WebConsoleMessage::LevelLog;
+}
+
} // namespace
// static
@@ -1409,6 +1426,8 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
OnExecuteNoValueEditCommand)
IPC_MESSAGE_HANDLER(FrameMsg_CSSInsertRequest, OnCSSInsertRequest)
IPC_MESSAGE_HANDLER(FrameMsg_AddMessageToConsole, OnAddMessageToConsole)
+ IPC_MESSAGE_HANDLER(FrameMsg_AddSecurityMessageToConsole,
+ OnAddSecurityMessageToConsole)
IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequest,
OnJavaScriptExecuteRequest)
IPC_MESSAGE_HANDLER(FrameMsg_JavaScriptExecuteRequestForTests,
@@ -1798,6 +1817,14 @@ void RenderFrameImpl::OnAddMessageToConsole(ConsoleMessageLevel level,
AddMessageToConsole(level, message);
}
+void RenderFrameImpl::OnAddSecurityMessageToConsole(
+ ConsoleMessageLevel level,
+ const std::string& message) {
+ blink::WebConsoleMessage wcm(translateConsoleLevel(level),
+ WebString::fromUTF8(message));
+ GetWebFrame()->addSecurityMessageToConsole(wcm);
nasko 2016/04/14 14:14:44 Why call a method? Just use frame_.
carlosk 2016/04/14 15:28:03 Done.
+}
+
void RenderFrameImpl::OnJavaScriptExecuteRequest(
const base::string16& jscript,
int id,
@@ -2359,8 +2386,11 @@ void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,
const std::string& message) {
- if (devtools_agent_)
- devtools_agent_->AddMessageToConsole(level, message);
+ if (devtools_agent_) {
+ blink::WebConsoleMessage wcm(translateConsoleLevel(level),
+ WebString::fromUTF8(message));
+ GetWebFrame()->addMessageToConsole(wcm);
+ }
}
bool RenderFrameImpl::IsUsingLoFi() const {

Powered by Google App Engine
This is Rietveld 408576698