diff options
| author | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 19:01:08 +0000 |
|---|---|---|
| committer | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 19:01:08 +0000 |
| commit | d09df4b682ac7216e707d5a749781d92716ffbe5 (patch) | |
| tree | d5cdb1c09fb85258d1c1d103f6642aed772cad2e /content/browser/renderer_host | |
| parent | 724571232ff3281f572c8a38aa7c2b3108db7847 (diff) | |
| download | chromium_src-d09df4b682ac7216e707d5a749781d92716ffbe5.zip chromium_src-d09df4b682ac7216e707d5a749781d92716ffbe5.tar.gz chromium_src-d09df4b682ac7216e707d5a749781d92716ffbe5.tar.bz2 | |
Pass over the log level of console.* JS calls from renderer to browser.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6812042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
| -rw-r--r-- | content/browser/renderer_host/render_view_host.cc | 9 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host.h | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index 7440df1..1f35dc3 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -1236,10 +1236,15 @@ void RenderViewHost::OnTakeFocus(bool reverse) { view->TakeFocus(reverse); } -void RenderViewHost::OnAddMessageToConsole(const std::wstring& message, +void RenderViewHost::OnAddMessageToConsole(int32 level, + const std::wstring& message, int32 line_no, const std::wstring& source_id) { - logging::LogMessage("CONSOLE", 0).stream() << "\"" << message + // Pass through log level only on WebUI pages to limit console spew. + int32 resolved_level = + BindingsPolicy::is_web_ui_enabled(enabled_bindings_) ? level : 0; + + logging::LogMessage("CONSOLE", resolved_level).stream() << "\"" << message << "\", source: " << source_id << " (" << line_no << ")"; } diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index 88dac2a..72920cb 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -578,7 +578,8 @@ class RenderViewHost : public RenderWidgetHost { const gfx::Point& image_offset); void OnUpdateDragCursor(WebKit::WebDragOperation drag_operation); void OnTakeFocus(bool reverse); - void OnAddMessageToConsole(const std::wstring& message, + void OnAddMessageToConsole(int32 level, + const std::wstring& message, int32 line_no, const std::wstring& source_id); void OnUpdateInspectorSetting(const std::string& key, |