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 <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 #include "mojo/public/cpp/bindings/strong_binding.h" | 107 #include "mojo/public/cpp/bindings/strong_binding.h" |
108 #include "services/service_manager/public/cpp/connector.h" | 108 #include "services/service_manager/public/cpp/connector.h" |
109 #include "services/service_manager/public/cpp/interface_provider.h" | 109 #include "services/service_manager/public/cpp/interface_provider.h" |
110 #include "ui/accessibility/ax_tree.h" | 110 #include "ui/accessibility/ax_tree.h" |
111 #include "ui/accessibility/ax_tree_update.h" | 111 #include "ui/accessibility/ax_tree_update.h" |
112 #include "ui/gfx/geometry/quad_f.h" | 112 #include "ui/gfx/geometry/quad_f.h" |
113 #include "url/gurl.h" | 113 #include "url/gurl.h" |
114 | 114 |
115 #if defined(OS_ANDROID) | 115 #if defined(OS_ANDROID) |
116 #include "content/browser/android/app_web_message_port_message_filter.h" | 116 #include "content/browser/android/app_web_message_port_message_filter.h" |
| 117 #include "content/browser/frame_host/render_frame_host_android.h" |
| 118 #include "content/browser/media/android/media_player_renderer.h" |
117 #include "content/public/browser/android/java_interfaces.h" | 119 #include "content/public/browser/android/java_interfaces.h" |
118 #include "content/browser/media/android/media_player_renderer.h" | |
119 #include "media/base/audio_renderer_sink.h" | 120 #include "media/base/audio_renderer_sink.h" |
120 #include "media/base/video_renderer_sink.h" | 121 #include "media/base/video_renderer_sink.h" |
121 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck | 122 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck |
122 #endif | 123 #endif |
123 | 124 |
124 #if defined(OS_MACOSX) | 125 #if defined(OS_MACOSX) |
125 #include "content/browser/frame_host/popup_menu_helper_mac.h" | 126 #include "content/browser/frame_host/popup_menu_helper_mac.h" |
126 #endif | 127 #endif |
127 | 128 |
128 #if defined(ENABLE_WEBVR) | 129 #if defined(ENABLE_WEBVR) |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 browser_plugin_embedder_ax_tree_id_(AXTreeIDRegistry::kNoAXTreeID), | 340 browser_plugin_embedder_ax_tree_id_(AXTreeIDRegistry::kNoAXTreeID), |
340 no_create_browser_accessibility_manager_for_testing_(false), | 341 no_create_browser_accessibility_manager_for_testing_(false), |
341 web_ui_type_(WebUI::kNoWebUI), | 342 web_ui_type_(WebUI::kNoWebUI), |
342 pending_web_ui_type_(WebUI::kNoWebUI), | 343 pending_web_ui_type_(WebUI::kNoWebUI), |
343 should_reuse_web_ui_(false), | 344 should_reuse_web_ui_(false), |
344 has_selection_(false), | 345 has_selection_(false), |
345 last_navigation_previews_state_(PREVIEWS_UNSPECIFIED), | 346 last_navigation_previews_state_(PREVIEWS_UNSPECIFIED), |
346 frame_host_binding_(this), | 347 frame_host_binding_(this), |
347 waiting_for_init_(renderer_initiated_creation), | 348 waiting_for_init_(renderer_initiated_creation), |
348 has_focused_editable_element_(false), | 349 has_focused_editable_element_(false), |
| 350 #if defined(OS_ANDROID) |
| 351 render_frame_host_android_(nullptr), |
| 352 #endif |
349 weak_ptr_factory_(this) { | 353 weak_ptr_factory_(this) { |
350 frame_tree_->AddRenderViewHostRef(render_view_host_); | 354 frame_tree_->AddRenderViewHostRef(render_view_host_); |
351 GetProcess()->AddRoute(routing_id_, this); | 355 GetProcess()->AddRoute(routing_id_, this); |
352 g_routing_id_frame_map.Get().insert(std::make_pair( | 356 g_routing_id_frame_map.Get().insert(std::make_pair( |
353 RenderFrameHostID(GetProcess()->GetID(), routing_id_), | 357 RenderFrameHostID(GetProcess()->GetID(), routing_id_), |
354 this)); | 358 this)); |
355 site_instance_->AddObserver(this); | 359 site_instance_->AddObserver(this); |
356 GetSiteInstance()->IncrementActiveFrameCount(); | 360 GetSiteInstance()->IncrementActiveFrameCount(); |
357 | 361 |
358 if (frame_tree_node_->parent()) { | 362 if (frame_tree_node_->parent()) { |
(...skipping 3146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3505 | 3509 |
3506 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3510 // There is no pending NavigationEntry in these cases, so pass 0 as the |
3507 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3511 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
3508 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3512 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
3509 return NavigationHandleImpl::Create( | 3513 return NavigationHandleImpl::Create( |
3510 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, | 3514 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, |
3511 params.was_within_same_page, base::TimeTicks::Now(), | 3515 params.was_within_same_page, base::TimeTicks::Now(), |
3512 entry_id_for_data_nav, false); // started_from_context_menu | 3516 entry_id_for_data_nav, false); // started_from_context_menu |
3513 } | 3517 } |
3514 | 3518 |
| 3519 #if defined(OS_ANDROID) |
| 3520 base::android::ScopedJavaLocalRef<jobject> |
| 3521 RenderFrameHostImpl::GetJavaRenderFrameHost() { |
| 3522 return GetRenderFrameHostAndroid()->GetJavaObject(); |
| 3523 } |
| 3524 |
| 3525 RenderFrameHostAndroid* RenderFrameHostImpl::GetRenderFrameHostAndroid() { |
| 3526 if (!render_frame_host_android_) |
| 3527 render_frame_host_android_ = new RenderFrameHostAndroid(this); |
| 3528 return render_frame_host_android_; |
| 3529 } |
| 3530 #endif |
| 3531 |
3515 } // namespace content | 3532 } // namespace content |
OLD | NEW |