| 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/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/containers/hash_tables.h" | 8 #include "base/containers/hash_tables.h" |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "content/browser/frame_host/frame_tree.h" | 24 #include "content/browser/frame_host/frame_tree.h" |
| 25 #include "content/browser/frame_host/frame_tree_node.h" | 25 #include "content/browser/frame_host/frame_tree_node.h" |
| 26 #include "content/browser/frame_host/navigation_handle_impl.h" | 26 #include "content/browser/frame_host/navigation_handle_impl.h" |
| 27 #include "content/browser/frame_host/navigation_request.h" | 27 #include "content/browser/frame_host/navigation_request.h" |
| 28 #include "content/browser/frame_host/navigator.h" | 28 #include "content/browser/frame_host/navigator.h" |
| 29 #include "content/browser/frame_host/navigator_impl.h" | 29 #include "content/browser/frame_host/navigator_impl.h" |
| 30 #include "content/browser/frame_host/render_frame_host_delegate.h" | 30 #include "content/browser/frame_host/render_frame_host_delegate.h" |
| 31 #include "content/browser/frame_host/render_frame_proxy_host.h" | 31 #include "content/browser/frame_host/render_frame_proxy_host.h" |
| 32 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 32 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 33 #include "content/browser/geolocation/geolocation_service_context.h" | 33 #include "content/browser/geolocation/geolocation_service_context.h" |
| 34 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| 34 #include "content/browser/permissions/permission_service_context.h" | 35 #include "content/browser/permissions/permission_service_context.h" |
| 35 #include "content/browser/permissions/permission_service_impl.h" | 36 #include "content/browser/permissions/permission_service_impl.h" |
| 36 #include "content/browser/presentation/presentation_service_impl.h" | 37 #include "content/browser/presentation/presentation_service_impl.h" |
| 37 #include "content/browser/renderer_host/input/input_router.h" | 38 #include "content/browser/renderer_host/input/input_router.h" |
| 38 #include "content/browser/renderer_host/input/timeout_monitor.h" | 39 #include "content/browser/renderer_host/input/timeout_monitor.h" |
| 39 #include "content/browser/renderer_host/render_process_host_impl.h" | 40 #include "content/browser/renderer_host/render_process_host_impl.h" |
| 40 #include "content/browser/renderer_host/render_view_host_delegate.h" | 41 #include "content/browser/renderer_host/render_view_host_delegate.h" |
| 41 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 42 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
| 42 #include "content/browser/renderer_host/render_view_host_impl.h" | 43 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 43 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 44 #include "content/browser/renderer_host/render_widget_host_delegate.h" |
| (...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 delegate_->RenderFrameCreated(this); | 756 delegate_->RenderFrameCreated(this); |
| 756 else | 757 else |
| 757 delegate_->RenderFrameDeleted(this); | 758 delegate_->RenderFrameDeleted(this); |
| 758 } | 759 } |
| 759 | 760 |
| 760 if (created && render_widget_host_) | 761 if (created && render_widget_host_) |
| 761 render_widget_host_->InitForFrame(); | 762 render_widget_host_->InitForFrame(); |
| 762 } | 763 } |
| 763 | 764 |
| 764 void RenderFrameHostImpl::Init() { | 765 void RenderFrameHostImpl::Init() { |
| 765 // TODO(csharrison): Call GetProcess()->ResumeRequestsForFrame(routing_id_) | 766 GetProcess()->ResumeRequestsForFrame(routing_id_); |
| 766 // once ResourceDispatcherHostImpl is keyed on render frame routing ids | |
| 767 // instead of render view routing ids. | |
| 768 } | 767 } |
| 769 | 768 |
| 770 void RenderFrameHostImpl::OnAddMessageToConsole( | 769 void RenderFrameHostImpl::OnAddMessageToConsole( |
| 771 int32 level, | 770 int32 level, |
| 772 const base::string16& message, | 771 const base::string16& message, |
| 773 int32 line_no, | 772 int32 line_no, |
| 774 const base::string16& source_id) { | 773 const base::string16& source_id) { |
| 775 if (delegate_->AddMessageToConsole(level, message, line_no, source_id)) | 774 if (delegate_->AddMessageToConsole(level, message, line_no, source_id)) |
| 776 return; | 775 return; |
| 777 | 776 |
| (...skipping 1738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2516 *dst = src; | 2515 *dst = src; |
| 2517 | 2516 |
| 2518 if (src.routing_id != -1) | 2517 if (src.routing_id != -1) |
| 2519 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); | 2518 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); |
| 2520 | 2519 |
| 2521 if (src.parent_routing_id != -1) | 2520 if (src.parent_routing_id != -1) |
| 2522 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); | 2521 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); |
| 2523 } | 2522 } |
| 2524 | 2523 |
| 2525 } // namespace content | 2524 } // namespace content |
| OLD | NEW |