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, since we use the contentWindow directly from |
| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 focused_, | 265 focused_, |
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 = nullptr; |
266 static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); | 276 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
267 if (owner_web_contents_) | 277 switches::kSitePerProcess)) { |
| 278 new_view = |
| 279 static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); |
| 280 } |
| 281 |
| 282 if (owner_web_contents_ && new_view) |
268 new_view->OnGuestDetached(owner_web_contents_->GetView()); | 283 new_view->OnGuestDetached(owner_web_contents_->GetView()); |
269 | 284 |
270 // Once a BrowserPluginGuest has an embedder WebContents, it's considered to | 285 // Once a BrowserPluginGuest has an embedder WebContents, it's considered to |
271 // be attached. | 286 // be attached. |
272 owner_web_contents_ = owner_web_contents; | 287 owner_web_contents_ = owner_web_contents; |
273 new_view->OnGuestAttached(owner_web_contents_->GetView()); | 288 if (new_view) |
| 289 new_view->OnGuestAttached(owner_web_contents_->GetView()); |
274 } | 290 } |
275 | 291 |
276 RendererPreferences* renderer_prefs = | 292 RendererPreferences* renderer_prefs = |
277 GetWebContents()->GetMutableRendererPrefs(); | 293 GetWebContents()->GetMutableRendererPrefs(); |
278 std::string guest_user_agent_override = renderer_prefs->user_agent_override; | 294 std::string guest_user_agent_override = renderer_prefs->user_agent_override; |
279 // Copy renderer preferences (and nothing else) from the embedder's | 295 // Copy renderer preferences (and nothing else) from the embedder's |
280 // WebContents to the guest. | 296 // WebContents to the guest. |
281 // | 297 // |
282 // For GTK and Aura this is necessary to get proper renderer configuration | 298 // For GTK and Aura this is necessary to get proper renderer configuration |
283 // values for caret blinking interval, colors related to selection and | 299 // values for caret blinking interval, colors related to selection and |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
562 | 578 |
563 // static | 579 // static |
564 bool BrowserPluginGuest::ShouldForwardToBrowserPluginGuest( | 580 bool BrowserPluginGuest::ShouldForwardToBrowserPluginGuest( |
565 const IPC::Message& message) { | 581 const IPC::Message& message) { |
566 return (message.type() != BrowserPluginHostMsg_Attach::ID) && | 582 return (message.type() != BrowserPluginHostMsg_Attach::ID) && |
567 (IPC_MESSAGE_CLASS(message) == BrowserPluginMsgStart); | 583 (IPC_MESSAGE_CLASS(message) == BrowserPluginMsgStart); |
568 } | 584 } |
569 | 585 |
570 bool BrowserPluginGuest::OnMessageReceived(const IPC::Message& message) { | 586 bool BrowserPluginGuest::OnMessageReceived(const IPC::Message& message) { |
571 bool handled = true; | 587 bool handled = true; |
| 588 // In --site-per-process, we do not need most of BrowserPluginGuest to drive |
| 589 // inner WebContents. |
| 590 // Right now InputHostMsg_ImeCompositionRangeChanged hits NOTREACHED() in |
| 591 // RWHVChildFrame, so we're disabling message handling entirely here. |
| 592 // TODO(lazyboy): Fix this as part of http://crbug.com/330264. The required |
| 593 // parts of code from this class should be exctracted to a separate class for |
| 594 // --site-per-process. |
| 595 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 596 switches::kSitePerProcess)) { |
| 597 return false; |
| 598 } |
| 599 |
572 IPC_BEGIN_MESSAGE_MAP(BrowserPluginGuest, message) | 600 IPC_BEGIN_MESSAGE_MAP(BrowserPluginGuest, message) |
573 IPC_MESSAGE_HANDLER(InputHostMsg_ImeCancelComposition, | 601 IPC_MESSAGE_HANDLER(InputHostMsg_ImeCancelComposition, |
574 OnImeCancelComposition) | 602 OnImeCancelComposition) |
575 #if defined(OS_MACOSX) || defined(USE_AURA) | 603 #if defined(OS_MACOSX) || defined(USE_AURA) |
576 IPC_MESSAGE_HANDLER(InputHostMsg_ImeCompositionRangeChanged, | 604 IPC_MESSAGE_HANDLER(InputHostMsg_ImeCompositionRangeChanged, |
577 OnImeCompositionRangeChanged) | 605 OnImeCompositionRangeChanged) |
578 #endif | 606 #endif |
579 IPC_MESSAGE_HANDLER(ViewHostMsg_HasTouchEventHandlers, | 607 IPC_MESSAGE_HANDLER(ViewHostMsg_HasTouchEventHandlers, |
580 OnHasTouchEventHandlers) | 608 OnHasTouchEventHandlers) |
581 IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnLockMouse) | 609 IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnLockMouse) |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
642 delegate_->WillAttach(embedder_web_contents, browser_plugin_instance_id, | 670 delegate_->WillAttach(embedder_web_contents, browser_plugin_instance_id, |
643 params.is_full_page_plugin, | 671 params.is_full_page_plugin, |
644 base::Bind(&BrowserPluginGuest::OnWillAttachComplete, | 672 base::Bind(&BrowserPluginGuest::OnWillAttachComplete, |
645 weak_ptr_factory_.GetWeakPtr(), | 673 weak_ptr_factory_.GetWeakPtr(), |
646 embedder_web_contents, params)); | 674 embedder_web_contents, params)); |
647 } | 675 } |
648 | 676 |
649 void BrowserPluginGuest::OnWillAttachComplete( | 677 void BrowserPluginGuest::OnWillAttachComplete( |
650 WebContentsImpl* embedder_web_contents, | 678 WebContentsImpl* embedder_web_contents, |
651 const BrowserPluginHostMsg_Attach_Params& params) { | 679 const BrowserPluginHostMsg_Attach_Params& params) { |
| 680 bool use_site_per_process = base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 681 switches::kSitePerProcess); |
652 // If a RenderView has already been created for this new window, then we need | 682 // If a RenderView has already been created for this new window, then we need |
653 // to initialize the browser-side state now so that the RenderFrameHostManager | 683 // to initialize the browser-side state now so that the RenderFrameHostManager |
654 // does not create a new RenderView on navigation. | 684 // does not create a new RenderView on navigation. |
655 if (has_render_view_) { | 685 if (!use_site_per_process && has_render_view_) { |
656 // This will trigger a callback to RenderViewReady after a round-trip IPC. | 686 // This will trigger a callback to RenderViewReady after a round-trip IPC. |
657 static_cast<RenderViewHostImpl*>( | 687 static_cast<RenderViewHostImpl*>( |
658 GetWebContents()->GetRenderViewHost())->Init(); | 688 GetWebContents()->GetRenderViewHost())->Init(); |
659 WebContentsViewGuest* web_contents_view = | 689 WebContentsViewGuest* web_contents_view = |
660 static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); | 690 static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); |
661 if (!web_contents()->GetRenderViewHost()->GetView()) { | 691 if (!web_contents()->GetRenderViewHost()->GetView()) { |
662 web_contents_view->CreateViewForWidget( | 692 web_contents_view->CreateViewForWidget( |
663 web_contents()->GetRenderViewHost(), true); | 693 web_contents()->GetRenderViewHost(), true); |
664 } | 694 } |
665 } | 695 } |
666 | 696 |
667 InitInternal(params, embedder_web_contents); | 697 InitInternal(params, embedder_web_contents); |
668 | 698 |
669 attached_ = true; | 699 attached_ = true; |
670 SendQueuedMessages(); | 700 SendQueuedMessages(); |
671 | 701 |
672 delegate_->DidAttach(GetGuestProxyRoutingID()); | 702 delegate_->DidAttach(GetGuestProxyRoutingID()); |
673 | 703 |
674 has_render_view_ = true; | 704 if (!use_site_per_process) { |
| 705 has_render_view_ = true; |
675 | 706 |
676 // Enable input method for guest if it's enabled for the embedder. | 707 // Enable input method for guest if it's enabled for the embedder. |
677 if (static_cast<RenderViewHostImpl*>( | 708 if (static_cast<RenderViewHostImpl*>( |
678 owner_web_contents_->GetRenderViewHost())->input_method_active()) { | 709 owner_web_contents_->GetRenderViewHost())->input_method_active()) { |
679 RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>( | 710 RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>( |
680 GetWebContents()->GetRenderViewHost()); | 711 GetWebContents()->GetRenderViewHost()); |
681 guest_rvh->SetInputMethodActive(true); | 712 guest_rvh->SetInputMethodActive(true); |
| 713 } |
682 } | 714 } |
683 | 715 |
684 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Attached")); | 716 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Attached")); |
685 } | 717 } |
686 | 718 |
687 void BrowserPluginGuest::OnCompositorFrameSwappedACK( | 719 void BrowserPluginGuest::OnCompositorFrameSwappedACK( |
688 int browser_plugin_instance_id, | 720 int browser_plugin_instance_id, |
689 const FrameHostMsg_CompositorFrameSwappedACK_Params& params) { | 721 const FrameHostMsg_CompositorFrameSwappedACK_Params& params) { |
690 RenderWidgetHostImpl::SendSwapCompositorFrameAck(params.producing_route_id, | 722 RenderWidgetHostImpl::SendSwapCompositorFrameAck(params.producing_route_id, |
691 params.output_surface_id, | 723 params.output_surface_id, |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 void BrowserPluginGuest::OnImeCompositionRangeChanged( | 957 void BrowserPluginGuest::OnImeCompositionRangeChanged( |
926 const gfx::Range& range, | 958 const gfx::Range& range, |
927 const std::vector<gfx::Rect>& character_bounds) { | 959 const std::vector<gfx::Rect>& character_bounds) { |
928 static_cast<RenderWidgetHostViewBase*>( | 960 static_cast<RenderWidgetHostViewBase*>( |
929 web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged( | 961 web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged( |
930 range, character_bounds); | 962 range, character_bounds); |
931 } | 963 } |
932 #endif | 964 #endif |
933 | 965 |
934 } // namespace content | 966 } // namespace content |
OLD | NEW |