Allow MimeHandlerViewGuest be embedded inside OOPIFs

components/guest_view/browser/guest_view_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/guest_view/browser/guest_view_base.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/guest_view/browser/guest_view_event.h"
 #include "components/guest_view/browser/guest_view_manager.h"
 #include "components/guest_view/common/guest_view_constants.h"
 #include "components/guest_view/common/guest_view_messages.h"
 #include "components/zoom/page_zoom.h"
 #include "components/zoom/zoom_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/url_constants.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 using content::WebContents;
 
 namespace content {
 struct FrameNavigateParams;
 }
@@ skipping 78 matching lines @@
     guest_->web_contents()->SetPageScale(page_scale_factor);
   }
 
   void DidUpdateAudioMutingState(bool muted) override {
     if (destroyed_)
       return;
 
     guest_->web_contents()->SetAudioMuted(muted);
   }
 
+  void RenderFrameDeleted(content::RenderFrameHost* rfh) {
+    guest_->OnRenderFrameHostDeleted(rfh->GetProcess()->GetID(),
+                                     rfh->GetRoutingID());
+  }
+
  private:
   bool is_fullscreen_;
   bool destroyed_;
   GuestViewBase* guest_;
 
   void Destroy() {
     if (destroyed_)
       return;
     destroyed_ = true;
     guest_->Destroy();
@@ skipping 261 matching lines @@
 
 WebContents* GuestViewBase::CreateNewGuestWindow(
     const WebContents::CreateParams& create_params) {
   auto* guest_manager = GuestViewManager::FromBrowserContext(browser_context());
   return guest_manager->CreateGuestWithWebContentsParams(
       GetViewType(),
       owner_web_contents(),
       create_params);
 }
 
+void GuestViewBase::OnRenderFrameHostDeleted(int process_id, int routing_id) {}
+
 void GuestViewBase::DidAttach(int guest_proxy_routing_id) {
   DCHECK(guest_proxy_routing_id_ == MSG_ROUTING_NONE ||
          guest_proxy_routing_id == guest_proxy_routing_id_);
   guest_proxy_routing_id_ = guest_proxy_routing_id;
 
   opener_lifetime_observer_.reset();
 
   SetUpSizing(*attach_params());
 
   // The guest should have the same muting state as the owner.
   web_contents()->SetAudioMuted(owner_web_contents()->IsAudioMuted());
 
   // Give the derived class an opportunity to perform some actions.
   DidAttachToEmbedder();
 
   // Inform the associated GuestViewContainer that the contentWindow is ready.
-  embedder_web_contents()->Send(new GuestViewMsg_GuestAttached(
-      element_instance_id_,
-      guest_proxy_routing_id));
+  GetOwnerRenderWidgetHost()->Send(new GuestViewMsg_GuestAttached(
+      element_instance_id_, guest_proxy_routing_id));
 
   SendQueuedEvents();
 }
 
 void GuestViewBase::DidDetach() {
   GuestViewManager::FromBrowserContext(browser_context_)->DetachGuest(this);
   StopTrackingEmbedderZoomLevel();
   owner_web_contents()->Send(new GuestViewMsg_GuestDetached(
       element_instance_id_));
   element_instance_id_ = kInstanceIDNone;
@@ skipping 287 matching lines @@
       attached() && embedder_web_contents()->GetDelegate()) {
     embedder_web_contents()->GetDelegate()->FindReply(embedder_web_contents(),
                                                       request_id,
                                                       number_of_matches,
                                                       selection_rect,
                                                       active_match_ordinal,
                                                       final_update);
   }
 }
 
+content::RenderWidgetHost* GuestViewBase::GetOwnerRenderWidgetHost() {
+  if (GetOwnerWebContents() &&
+      GetOwnerWebContents()->GetRenderWidgetHostView()) {
+    return GetOwnerWebContents()
+        ->GetRenderWidgetHostView()
+        ->GetRenderWidgetHost();
+  }
+  return nullptr;
+}
+
+content::SiteInstance* GuestViewBase::GetOwnerSiteInstance() {
+  if (auto* owner_contents = GetOwnerWebContents())
+    return owner_contents->GetSiteInstance();

[Charlie Reis, 2016/11/16 22:25:27]

Please put comments in both of these methods about the assumption that frames
can exist inside the owner but not OOPIFs (i.e., that the guest may be inside a
subframe but it's guaranteed to have the same widget and SiteInstance as the
main frame).

That's a useful breadcrumb in case we ever change that behavior.

[EhsanK, 2016/11/16 22:47:49]

Done.

+  return nullptr;
+}
+
 void GuestViewBase::OnZoomChanged(
     const zoom::ZoomController::ZoomChangedEventData& data) {
   if (data.web_contents == embedder_web_contents()) {
     // The embedder's zoom level has changed.
     auto* guest_zoom_controller =
         zoom::ZoomController::FromWebContents(web_contents());
     if (content::ZoomValuesEqual(data.new_zoom_level,
                                  guest_zoom_controller->GetZoomLevel())) {
       return;
     }
@@ skipping 147 matching lines @@
 
 void GuestViewBase::UpdateGuestSize(const gfx::Size& new_size,
                                     bool due_to_auto_resize) {
   if (due_to_auto_resize)
     GuestSizeChangedDueToAutoSize(guest_size_, new_size);
   DispatchOnResizeEvent(guest_size_, new_size);
   guest_size_ = new_size;
 }
 
 }  // namespace guest_view