| 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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1611 break; | 1611 break; |
| 1612 case blink::WebConsoleMessage::LevelError: | 1612 case blink::WebConsoleMessage::LevelError: |
| 1613 log_severity = logging::LOG_ERROR; | 1613 log_severity = logging::LOG_ERROR; |
| 1614 break; | 1614 break; |
| 1615 default: | 1615 default: |
| 1616 NOTREACHED(); | 1616 NOTREACHED(); |
| 1617 } | 1617 } |
| 1618 | 1618 |
| 1619 if (shouldReportDetailedMessageForSource(source_name)) { | 1619 if (shouldReportDetailedMessageForSource(source_name)) { |
| 1620 FOR_EACH_OBSERVER( | 1620 FOR_EACH_OBSERVER( |
| 1621 RenderViewObserver, render_view_->observers(), | |
| 1622 DetailedConsoleMessageAdded(message.text, | |
| 1623 source_name, | |
| 1624 stack_trace, | |
| 1625 source_line, | |
| 1626 static_cast<int32>(log_severity))); | |
| 1627 FOR_EACH_OBSERVER( | |
| 1628 RenderFrameObserver, observers_, | 1621 RenderFrameObserver, observers_, |
| 1629 DetailedConsoleMessageAdded(message.text, | 1622 DetailedConsoleMessageAdded(message.text, |
| 1630 source_name, | 1623 source_name, |
| 1631 stack_trace, | 1624 stack_trace, |
| 1632 source_line, | 1625 source_line, |
| 1633 static_cast<int32>(log_severity))); | 1626 static_cast<int32>(log_severity))); |
| 1634 } | 1627 } |
| 1635 | 1628 |
| 1636 Send(new FrameHostMsg_AddMessageToConsole(routing_id_, | 1629 Send(new FrameHostMsg_AddMessageToConsole(routing_id_, |
| 1637 static_cast<int32>(log_severity), | 1630 static_cast<int32>(log_severity), |
| (...skipping 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3507 #if defined(VIDEO_HOLE) | 3500 #if defined(VIDEO_HOLE) |
| 3508 render_view_->RegisterVideoHoleFrame(this); | 3501 render_view_->RegisterVideoHoleFrame(this); |
| 3509 #endif // defined(VIDEO_HOLE) | 3502 #endif // defined(VIDEO_HOLE) |
| 3510 } | 3503 } |
| 3511 return media_player_manager_; | 3504 return media_player_manager_; |
| 3512 } | 3505 } |
| 3513 | 3506 |
| 3514 #endif // defined(OS_ANDROID) | 3507 #endif // defined(OS_ANDROID) |
| 3515 | 3508 |
| 3516 } // namespace content | 3509 } // namespace content |
| OLD | NEW |