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/browser/browser_plugin/browser_plugin_guest.h" | 5 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | |
9 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
10 #include "base/pickle.h" | 11 #include "base/pickle.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "content/browser/browser_plugin/browser_plugin_embedder.h" | 13 #include "content/browser/browser_plugin/browser_plugin_embedder.h" |
13 #include "content/browser/browser_thread_impl.h" | 14 #include "content/browser/browser_thread_impl.h" |
14 #include "content/browser/child_process_security_policy_impl.h" | 15 #include "content/browser/child_process_security_policy_impl.h" |
15 #include "content/browser/frame_host/render_frame_host_impl.h" | 16 #include "content/browser/frame_host/render_frame_host_impl.h" |
16 #include "content/browser/frame_host/render_widget_host_view_guest.h" | 17 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
17 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 18 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
18 #include "content/browser/renderer_host/render_view_host_impl.h" | 19 #include "content/browser/renderer_host/render_view_host_impl.h" |
19 #include "content/browser/renderer_host/render_widget_host_impl.h" | 20 #include "content/browser/renderer_host/render_widget_host_impl.h" |
20 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 21 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
21 #include "content/browser/web_contents/web_contents_impl.h" | 22 #include "content/browser/web_contents/web_contents_impl.h" |
22 #include "content/browser/web_contents/web_contents_view_guest.h" | 23 #include "content/browser/web_contents/web_contents_view_guest.h" |
23 #include "content/common/browser_plugin/browser_plugin_constants.h" | 24 #include "content/common/browser_plugin/browser_plugin_constants.h" |
24 #include "content/common/browser_plugin/browser_plugin_messages.h" | 25 #include "content/common/browser_plugin/browser_plugin_messages.h" |
25 #include "content/common/content_constants_internal.h" | 26 #include "content/common/content_constants_internal.h" |
26 #include "content/common/drag_messages.h" | 27 #include "content/common/drag_messages.h" |
27 #include "content/common/frame_messages.h" | 28 #include "content/common/frame_messages.h" |
28 #include "content/common/host_shared_bitmap_manager.h" | 29 #include "content/common/host_shared_bitmap_manager.h" |
29 #include "content/common/input_messages.h" | 30 #include "content/common/input_messages.h" |
30 #include "content/common/view_messages.h" | 31 #include "content/common/view_messages.h" |
31 #include "content/public/browser/browser_context.h" | 32 #include "content/public/browser/browser_context.h" |
32 #include "content/public/browser/browser_plugin_guest_manager.h" | 33 #include "content/public/browser/browser_plugin_guest_manager.h" |
33 #include "content/public/browser/content_browser_client.h" | 34 #include "content/public/browser/content_browser_client.h" |
34 #include "content/public/browser/guest_host.h" | 35 #include "content/public/browser/guest_host.h" |
35 #include "content/public/browser/render_widget_host_view.h" | 36 #include "content/public/browser/render_widget_host_view.h" |
36 #include "content/public/browser/user_metrics.h" | 37 #include "content/public/browser/user_metrics.h" |
37 #include "content/public/browser/web_contents_observer.h" | 38 #include "content/public/browser/web_contents_observer.h" |
39 #include "content/public/common/content_switches.h" | |
38 #include "content/public/common/drop_data.h" | 40 #include "content/public/common/drop_data.h" |
39 #include "ui/gfx/geometry/size_conversions.h" | 41 #include "ui/gfx/geometry/size_conversions.h" |
40 | 42 |
41 #if defined(OS_MACOSX) | 43 #if defined(OS_MACOSX) |
42 #include "content/browser/browser_plugin/browser_plugin_popup_menu_helper_mac.h" | 44 #include "content/browser/browser_plugin/browser_plugin_popup_menu_helper_mac.h" |
43 #endif | 45 #endif |
44 | 46 |
45 namespace content { | 47 namespace content { |
46 | 48 |
47 class BrowserPluginGuest::EmbedderVisibilityObserver | 49 class BrowserPluginGuest::EmbedderVisibilityObserver |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
96 delegate_(delegate), | 98 delegate_(delegate), |
97 weak_ptr_factory_(this) { | 99 weak_ptr_factory_(this) { |
98 DCHECK(web_contents); | 100 DCHECK(web_contents); |
99 DCHECK(delegate); | 101 DCHECK(delegate); |
100 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Create")); | 102 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Create")); |
101 web_contents->SetBrowserPluginGuest(this); | 103 web_contents->SetBrowserPluginGuest(this); |
102 delegate->SetGuestHost(this); | 104 delegate->SetGuestHost(this); |
103 } | 105 } |
104 | 106 |
105 int BrowserPluginGuest::GetGuestProxyRoutingID() { | 107 int BrowserPluginGuest::GetGuestProxyRoutingID() { |
108 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
109 switches::kSitePerProcess)) { | |
110 // We don't directly use the proxy to send postMessage in | |
111 // --site-per-process, we use the contentWindow directly from | |
Charlie Reis
2015/05/19 07:12:30
nit: , since
lazyboy
2015/05/21 23:23:46
Done.
| |
112 // the frame element instead. | |
113 return MSG_ROUTING_NONE; | |
114 } | |
115 | |
106 if (guest_proxy_routing_id_ != MSG_ROUTING_NONE) | 116 if (guest_proxy_routing_id_ != MSG_ROUTING_NONE) |
107 return guest_proxy_routing_id_; | 117 return guest_proxy_routing_id_; |
108 | 118 |
109 // Create a swapped out RenderView for the guest in the embedder renderer | 119 // Create a swapped out RenderView for the guest in the embedder renderer |
110 // process, so that the embedder can access the guest's window object. | 120 // process, so that the embedder can access the guest's window object. |
111 // On reattachment, we can reuse the same swapped out RenderView because | 121 // On reattachment, we can reuse the same swapped out RenderView because |
112 // the embedder process will always be the same even if the embedder | 122 // the embedder process will always be the same even if the embedder |
113 // WebContents changes. | 123 // WebContents changes. |
114 // | 124 // |
115 // TODO(fsamuel): Make sure this works for transferring guests across | 125 // TODO(fsamuel): Make sure this works for transferring guests across |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
256 blink::WebFocusTypeNone); | 266 blink::WebFocusTypeNone); |
257 | 267 |
258 guest_visible_ = params.visible; | 268 guest_visible_ = params.visible; |
259 UpdateVisibility(); | 269 UpdateVisibility(); |
260 | 270 |
261 is_full_page_plugin_ = params.is_full_page_plugin; | 271 is_full_page_plugin_ = params.is_full_page_plugin; |
262 guest_window_rect_ = params.view_rect; | 272 guest_window_rect_ = params.view_rect; |
263 | 273 |
264 if (owner_web_contents_ != owner_web_contents) { | 274 if (owner_web_contents_ != owner_web_contents) { |
265 WebContentsViewGuest* new_view = | 275 WebContentsViewGuest* new_view = |
266 static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); | 276 base::CommandLine::ForCurrentProcess()->HasSwitch( |
267 if (owner_web_contents_) | 277 switches::kSitePerProcess) |
278 ? nullptr | |
279 : static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); | |
Charlie Reis
2015/05/19 07:12:30
Style nit: This is a bit awkward to read. Maybe i
lazyboy
2015/05/21 23:23:46
Done.
| |
280 if (owner_web_contents_ && new_view) | |
268 new_view->OnGuestDetached(owner_web_contents_->GetView()); | 281 new_view->OnGuestDetached(owner_web_contents_->GetView()); |
269 | 282 |
270 // Once a BrowserPluginGuest has an embedder WebContents, it's considered to | 283 // Once a BrowserPluginGuest has an embedder WebContents, it's considered to |
271 // be attached. | 284 // be attached. |
272 owner_web_contents_ = owner_web_contents; | 285 owner_web_contents_ = owner_web_contents; |
273 new_view->OnGuestAttached(owner_web_contents_->GetView()); | 286 if (new_view) |
287 new_view->OnGuestAttached(owner_web_contents_->GetView()); | |
274 } | 288 } |
275 | 289 |
276 RendererPreferences* renderer_prefs = | 290 RendererPreferences* renderer_prefs = |
277 GetWebContents()->GetMutableRendererPrefs(); | 291 GetWebContents()->GetMutableRendererPrefs(); |
278 std::string guest_user_agent_override = renderer_prefs->user_agent_override; | 292 std::string guest_user_agent_override = renderer_prefs->user_agent_override; |
279 // Copy renderer preferences (and nothing else) from the embedder's | 293 // Copy renderer preferences (and nothing else) from the embedder's |
280 // WebContents to the guest. | 294 // WebContents to the guest. |
281 // | 295 // |
282 // For GTK and Aura this is necessary to get proper renderer configuration | 296 // For GTK and Aura this is necessary to get proper renderer configuration |
283 // values for caret blinking interval, colors related to selection and | 297 // values for caret blinking interval, colors related to selection and |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
639 delegate_->WillAttach(embedder_web_contents, browser_plugin_instance_id, | 653 delegate_->WillAttach(embedder_web_contents, browser_plugin_instance_id, |
640 params.is_full_page_plugin, | 654 params.is_full_page_plugin, |
641 base::Bind(&BrowserPluginGuest::OnWillAttachComplete, | 655 base::Bind(&BrowserPluginGuest::OnWillAttachComplete, |
642 weak_ptr_factory_.GetWeakPtr(), | 656 weak_ptr_factory_.GetWeakPtr(), |
643 embedder_web_contents, params)); | 657 embedder_web_contents, params)); |
644 } | 658 } |
645 | 659 |
646 void BrowserPluginGuest::OnWillAttachComplete( | 660 void BrowserPluginGuest::OnWillAttachComplete( |
647 WebContentsImpl* embedder_web_contents, | 661 WebContentsImpl* embedder_web_contents, |
648 const BrowserPluginHostMsg_Attach_Params& params) { | 662 const BrowserPluginHostMsg_Attach_Params& params) { |
663 bool use_site_per_process = base::CommandLine::ForCurrentProcess()->HasSwitch( | |
664 switches::kSitePerProcess); | |
649 // If a RenderView has already been created for this new window, then we need | 665 // If a RenderView has already been created for this new window, then we need |
650 // to initialize the browser-side state now so that the RenderFrameHostManager | 666 // to initialize the browser-side state now so that the RenderFrameHostManager |
651 // does not create a new RenderView on navigation. | 667 // does not create a new RenderView on navigation. |
652 if (has_render_view_) { | 668 if (!use_site_per_process && has_render_view_) { |
653 // This will trigger a callback to RenderViewReady after a round-trip IPC. | 669 // This will trigger a callback to RenderViewReady after a round-trip IPC. |
654 static_cast<RenderViewHostImpl*>( | 670 static_cast<RenderViewHostImpl*>( |
655 GetWebContents()->GetRenderViewHost())->Init(); | 671 GetWebContents()->GetRenderViewHost())->Init(); |
656 WebContentsViewGuest* web_contents_view = | 672 WebContentsViewGuest* web_contents_view = |
657 static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); | 673 static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); |
658 if (!web_contents()->GetRenderViewHost()->GetView()) { | 674 if (!web_contents()->GetRenderViewHost()->GetView()) { |
659 web_contents_view->CreateViewForWidget( | 675 web_contents_view->CreateViewForWidget( |
660 web_contents()->GetRenderViewHost(), true); | 676 web_contents()->GetRenderViewHost(), true); |
661 } | 677 } |
662 } | 678 } |
663 | 679 |
664 InitInternal(params, embedder_web_contents); | 680 InitInternal(params, embedder_web_contents); |
665 | 681 |
666 attached_ = true; | 682 attached_ = true; |
667 SendQueuedMessages(); | 683 SendQueuedMessages(); |
668 | 684 |
669 delegate_->DidAttach(GetGuestProxyRoutingID()); | 685 delegate_->DidAttach(GetGuestProxyRoutingID()); |
670 | 686 |
671 has_render_view_ = true; | 687 if (!use_site_per_process) { |
688 has_render_view_ = true; | |
672 | 689 |
673 // Enable input method for guest if it's enabled for the embedder. | 690 // Enable input method for guest if it's enabled for the embedder. |
674 if (static_cast<RenderViewHostImpl*>( | 691 if (static_cast<RenderViewHostImpl*>( |
675 owner_web_contents_->GetRenderViewHost())->input_method_active()) { | 692 owner_web_contents_->GetRenderViewHost())->input_method_active()) { |
676 RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>( | 693 RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>( |
677 GetWebContents()->GetRenderViewHost()); | 694 GetWebContents()->GetRenderViewHost()); |
678 guest_rvh->SetInputMethodActive(true); | 695 guest_rvh->SetInputMethodActive(true); |
696 } | |
679 } | 697 } |
680 | 698 |
681 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Attached")); | 699 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Attached")); |
682 } | 700 } |
683 | 701 |
684 void BrowserPluginGuest::OnCompositorFrameSwappedACK( | 702 void BrowserPluginGuest::OnCompositorFrameSwappedACK( |
685 int browser_plugin_instance_id, | 703 int browser_plugin_instance_id, |
686 const FrameHostMsg_CompositorFrameSwappedACK_Params& params) { | 704 const FrameHostMsg_CompositorFrameSwappedACK_Params& params) { |
687 RenderWidgetHostImpl::SendSwapCompositorFrameAck(params.producing_route_id, | 705 RenderWidgetHostImpl::SendSwapCompositorFrameAck(params.producing_route_id, |
688 params.output_surface_id, | 706 params.output_surface_id, |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
922 void BrowserPluginGuest::OnImeCompositionRangeChanged( | 940 void BrowserPluginGuest::OnImeCompositionRangeChanged( |
923 const gfx::Range& range, | 941 const gfx::Range& range, |
924 const std::vector<gfx::Rect>& character_bounds) { | 942 const std::vector<gfx::Rect>& character_bounds) { |
925 static_cast<RenderWidgetHostViewBase*>( | 943 static_cast<RenderWidgetHostViewBase*>( |
926 web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged( | 944 web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged( |
927 range, character_bounds); | 945 range, character_bounds); |
928 } | 946 } |
929 #endif | 947 #endif |
930 | 948 |
931 } // namespace content | 949 } // namespace content |
OLD | NEW |