OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/renderer/extensions/console.h" | 5 #include "chrome/renderer/extensions/console.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/debug/alias.h" | 8 #include "base/debug/alias.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 } | 105 } |
106 | 106 |
107 void Fatal(content::RenderView* render_view, const std::string& message) { | 107 void Fatal(content::RenderView* render_view, const std::string& message) { |
108 Error(render_view, message); | 108 Error(render_view, message); |
109 CheckWithMinidump(message); | 109 CheckWithMinidump(message); |
110 } | 110 } |
111 | 111 |
112 void AddMessage(content::RenderView* render_view, | 112 void AddMessage(content::RenderView* render_view, |
113 content::ConsoleMessageLevel level, | 113 content::ConsoleMessageLevel level, |
114 const std::string& message) { | 114 const std::string& message) { |
115 WebKit::WebView* web_view = render_view->GetWebView(); | 115 blink::WebView* web_view = render_view->GetWebView(); |
116 if (!web_view || !web_view->mainFrame()) | 116 if (!web_view || !web_view->mainFrame()) |
117 return; | 117 return; |
118 WebKit::WebConsoleMessage::Level target_level = | 118 blink::WebConsoleMessage::Level target_level = |
119 WebKit::WebConsoleMessage::LevelLog; | 119 blink::WebConsoleMessage::LevelLog; |
120 switch (level) { | 120 switch (level) { |
121 case content::CONSOLE_MESSAGE_LEVEL_DEBUG: | 121 case content::CONSOLE_MESSAGE_LEVEL_DEBUG: |
122 target_level = WebKit::WebConsoleMessage::LevelDebug; | 122 target_level = blink::WebConsoleMessage::LevelDebug; |
123 break; | 123 break; |
124 case content::CONSOLE_MESSAGE_LEVEL_LOG: | 124 case content::CONSOLE_MESSAGE_LEVEL_LOG: |
125 target_level = WebKit::WebConsoleMessage::LevelLog; | 125 target_level = blink::WebConsoleMessage::LevelLog; |
126 break; | 126 break; |
127 case content::CONSOLE_MESSAGE_LEVEL_WARNING: | 127 case content::CONSOLE_MESSAGE_LEVEL_WARNING: |
128 target_level = WebKit::WebConsoleMessage::LevelWarning; | 128 target_level = blink::WebConsoleMessage::LevelWarning; |
129 break; | 129 break; |
130 case content::CONSOLE_MESSAGE_LEVEL_ERROR: | 130 case content::CONSOLE_MESSAGE_LEVEL_ERROR: |
131 target_level = WebKit::WebConsoleMessage::LevelError; | 131 target_level = blink::WebConsoleMessage::LevelError; |
132 break; | 132 break; |
133 } | 133 } |
134 web_view->mainFrame()->addMessageToConsole( | 134 web_view->mainFrame()->addMessageToConsole( |
135 WebKit::WebConsoleMessage(target_level, ASCIIToUTF16(message))); | 135 blink::WebConsoleMessage(target_level, ASCIIToUTF16(message))); |
136 } | 136 } |
137 | 137 |
138 void Debug(v8::Handle<v8::Context> context, const std::string& message) { | 138 void Debug(v8::Handle<v8::Context> context, const std::string& message) { |
139 AddMessage(context, content::CONSOLE_MESSAGE_LEVEL_DEBUG, message); | 139 AddMessage(context, content::CONSOLE_MESSAGE_LEVEL_DEBUG, message); |
140 } | 140 } |
141 | 141 |
142 void Log(v8::Handle<v8::Context> context, const std::string& message) { | 142 void Log(v8::Handle<v8::Context> context, const std::string& message) { |
143 AddMessage(context, content::CONSOLE_MESSAGE_LEVEL_LOG, message); | 143 AddMessage(context, content::CONSOLE_MESSAGE_LEVEL_LOG, message); |
144 } | 144 } |
145 | 145 |
(...skipping 30 matching lines...) Expand all Loading... |
176 v8::Local<v8::Object> console_object = v8::Object::New(); | 176 v8::Local<v8::Object> console_object = v8::Object::New(); |
177 BindLogMethod(console_object, "debug", &Debug); | 177 BindLogMethod(console_object, "debug", &Debug); |
178 BindLogMethod(console_object, "log", &Log); | 178 BindLogMethod(console_object, "log", &Log); |
179 BindLogMethod(console_object, "warn", &Warn); | 179 BindLogMethod(console_object, "warn", &Warn); |
180 BindLogMethod(console_object, "error", &Error); | 180 BindLogMethod(console_object, "error", &Error); |
181 return handle_scope.Close(console_object); | 181 return handle_scope.Close(console_object); |
182 } | 182 } |
183 | 183 |
184 } // namespace console | 184 } // namespace console |
185 } // namespace extensions | 185 } // namespace extensions |
OLD | NEW |