| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index 147dd62fd53d4e898ea4f0568657cfae92d3da6f..2a51a730ff2dcdb7d8376397ec7535d81a70f109 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -26,6 +26,7 @@
|
| #include "content/public/browser/render_widget_host_view.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/common/url_constants.h"
|
| +#include "content/public/common/url_utils.h"
|
| #include "url/gurl.h"
|
|
|
| using base::TimeDelta;
|
| @@ -303,6 +304,7 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
|
| bool handled = true;
|
| bool msg_is_ok = true;
|
| IPC_BEGIN_MESSAGE_MAP_EX(RenderFrameHostImpl, msg, msg_is_ok)
|
| + IPC_MESSAGE_HANDLER(FrameHostMsg_AddMessageToConsole, OnAddMessageToConsole)
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach)
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused)
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoadForFrame,
|
| @@ -339,6 +341,23 @@ void RenderFrameHostImpl::Init() {
|
| GetProcess()->ResumeRequestsForView(routing_id_);
|
| }
|
|
|
| +void RenderFrameHostImpl::OnAddMessageToConsole(
|
| + int32 level,
|
| + const base::string16& message,
|
| + int32 line_no,
|
| + const base::string16& source_id) {
|
| + if (delegate_->AddMessageToConsole(level, message, line_no, source_id))
|
| + return;
|
| +
|
| + // Pass through log level only on WebUI pages to limit console spew.
|
| + int32 resolved_level = HasWebUIScheme(delegate_->GetURL()) ? level : 0;
|
| +
|
| + if (resolved_level >= ::logging::GetMinLogLevel()) {
|
| + logging::LogMessage("CONSOLE", line_no, resolved_level).stream() << "\"" <<
|
| + message << "\", source: " << source_id << " (" << line_no << ")";
|
| + }
|
| +}
|
| +
|
| void RenderFrameHostImpl::OnCreateChildFrame(int new_routing_id,
|
| const std::string& frame_name) {
|
| RenderFrameHostImpl* new_frame = frame_tree_->AddFrame(
|
|
|