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 2395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2406 case WebConsoleMessage::LevelWarning: | 2406 case WebConsoleMessage::LevelWarning: |
2407 log_severity = logging::LOG_WARNING; | 2407 log_severity = logging::LOG_WARNING; |
2408 break; | 2408 break; |
2409 case WebConsoleMessage::LevelError: | 2409 case WebConsoleMessage::LevelError: |
2410 log_severity = logging::LOG_ERROR; | 2410 log_severity = logging::LOG_ERROR; |
2411 break; | 2411 break; |
2412 default: | 2412 default: |
2413 NOTREACHED(); | 2413 NOTREACHED(); |
2414 } | 2414 } |
2415 | 2415 |
| 2416 if (shouldReportDetailedMessageForSource(source_name)) { |
| 2417 FOR_EACH_OBSERVER( |
| 2418 RenderViewObserver, |
| 2419 observers_, |
| 2420 OnDetailedConsoleMessageAdded(message.text, |
| 2421 source_name, |
| 2422 stack_trace, |
| 2423 source_line, |
| 2424 static_cast<int32>(log_severity))); |
| 2425 } |
| 2426 |
2416 Send(new ViewHostMsg_AddMessageToConsole(routing_id_, | 2427 Send(new ViewHostMsg_AddMessageToConsole(routing_id_, |
2417 static_cast<int32>(log_severity), | 2428 static_cast<int32>(log_severity), |
2418 message.text, | 2429 message.text, |
2419 static_cast<int32>(source_line), | 2430 static_cast<int32>(source_line), |
2420 source_name, | 2431 source_name)); |
2421 stack_trace)); | |
2422 } | 2432 } |
2423 | 2433 |
2424 void RenderViewImpl::printPage(WebFrame* frame) { | 2434 void RenderViewImpl::printPage(WebFrame* frame) { |
2425 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 2435 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
2426 PrintPage(frame, handling_input_event_)); | 2436 PrintPage(frame, handling_input_event_)); |
2427 } | 2437 } |
2428 | 2438 |
2429 WebKit::WebNotificationPresenter* RenderViewImpl::notificationPresenter() { | 2439 WebKit::WebNotificationPresenter* RenderViewImpl::notificationPresenter() { |
2430 return notification_provider_; | 2440 return notification_provider_; |
2431 } | 2441 } |
(...skipping 4109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6541 for (size_t i = 0; i < icon_urls.size(); i++) { | 6551 for (size_t i = 0; i < icon_urls.size(); i++) { |
6542 WebURL url = icon_urls[i].iconURL(); | 6552 WebURL url = icon_urls[i].iconURL(); |
6543 if (!url.isEmpty()) | 6553 if (!url.isEmpty()) |
6544 urls.push_back(FaviconURL(url, | 6554 urls.push_back(FaviconURL(url, |
6545 ToFaviconType(icon_urls[i].iconType()))); | 6555 ToFaviconType(icon_urls[i].iconType()))); |
6546 } | 6556 } |
6547 SendUpdateFaviconURL(urls); | 6557 SendUpdateFaviconURL(urls); |
6548 } | 6558 } |
6549 | 6559 |
6550 } // namespace content | 6560 } // namespace content |
OLD | NEW |