| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2384 } | 2384 } |
| 2385 | 2385 |
| 2386 bool RenderViewImpl::shouldReportDetailedMessageForSource( | 2386 bool RenderViewImpl::shouldReportDetailedMessageForSource( |
| 2387 const WebString& source) { | 2387 const WebString& source) { |
| 2388 return GetContentClient()->renderer()->ShouldReportDetailedMessageForSource( | 2388 return GetContentClient()->renderer()->ShouldReportDetailedMessageForSource( |
| 2389 source); | 2389 source); |
| 2390 } | 2390 } |
| 2391 | 2391 |
| 2392 void RenderViewImpl::didAddMessageToConsole( | 2392 void RenderViewImpl::didAddMessageToConsole( |
| 2393 const WebConsoleMessage& message, const WebString& source_name, | 2393 const WebConsoleMessage& message, const WebString& source_name, |
| 2394 unsigned source_line) { | |
| 2395 didAddMessageToConsole(message, source_name, source_line, WebString()); | |
| 2396 } | |
| 2397 | |
| 2398 void RenderViewImpl::didAddMessageToConsole( | |
| 2399 const WebConsoleMessage& message, const WebString& source_name, | |
| 2400 unsigned source_line, const WebString& stack_trace) { | 2394 unsigned source_line, const WebString& stack_trace) { |
| 2401 logging::LogSeverity log_severity = logging::LOG_VERBOSE; | 2395 logging::LogSeverity log_severity = logging::LOG_VERBOSE; |
| 2402 switch (message.level) { | 2396 switch (message.level) { |
| 2403 case WebConsoleMessage::LevelDebug: | 2397 case WebConsoleMessage::LevelDebug: |
| 2404 log_severity = logging::LOG_VERBOSE; | 2398 log_severity = logging::LOG_VERBOSE; |
| 2405 break; | 2399 break; |
| 2406 case WebConsoleMessage::LevelLog: | 2400 case WebConsoleMessage::LevelLog: |
| 2407 log_severity = logging::LOG_INFO; | 2401 log_severity = logging::LOG_INFO; |
| 2408 break; | 2402 break; |
| 2409 case WebConsoleMessage::LevelWarning: | 2403 case WebConsoleMessage::LevelWarning: |
| (...skipping 4127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6537 for (size_t i = 0; i < icon_urls.size(); i++) { | 6531 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6538 WebURL url = icon_urls[i].iconURL(); | 6532 WebURL url = icon_urls[i].iconURL(); |
| 6539 if (!url.isEmpty()) | 6533 if (!url.isEmpty()) |
| 6540 urls.push_back(FaviconURL(url, | 6534 urls.push_back(FaviconURL(url, |
| 6541 ToFaviconType(icon_urls[i].iconType()))); | 6535 ToFaviconType(icon_urls[i].iconType()))); |
| 6542 } | 6536 } |
| 6543 SendUpdateFaviconURL(urls); | 6537 SendUpdateFaviconURL(urls); |
| 6544 } | 6538 } |
| 6545 | 6539 |
| 6546 } // namespace content | 6540 } // namespace content |
| OLD | NEW |