Force MimeHandlerView to always use BrowserPlugin

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 73 matching lines @@
 #include "content/common/page_state_serialization.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_url_parameters.h"
+#include "content/public/browser/guest_mode.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/load_notification_details.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/screen_orientation_dispatcher_host.h"
@@ skipping 1292 matching lines @@
 }
 
 void WebContentsImpl::DispatchBeforeUnload() {
   bool for_cross_site_transition = false;
   GetMainFrame()->DispatchBeforeUnload(for_cross_site_transition, false);
 }
 
 void WebContentsImpl::AttachToOuterWebContentsFrame(
     WebContents* outer_web_contents,
     RenderFrameHost* outer_contents_frame) {
-  CHECK(BrowserPluginGuestMode::UseCrossProcessFramesForGuests());
+  CHECK(guest_mode::IsCrossProcessFrameGuest(this));
   RenderFrameHostManager* render_manager = GetRenderManager();
 
   // When the WebContents being initialized has an opener, the  browser side
   // Render{View,Frame}Host must be initialized and the RenderWidgetHostView
   // created. This is needed because the usual initialization happens during
   // the first navigation, but when attaching a new window we don't navigate
   // before attaching. If the browser side is already initialized, the calls
   // below will just early return.
   render_manager->InitRenderView(GetRenderViewHost(), nullptr);
   GetMainFrame()->Init();
@@ skipping 135 matching lines @@
           switches::kUseMusInRenderer)) {
     ui::Window* mus_window = aura::GetMusWindow(params.context);
     if (mus_window) {
       view_.reset(new WebContentsViewMus(mus_window, this, delegate,
                                          &render_view_host_delegate_view_));
     }
   }
 #endif
 
   if (!view_) {
-    if (browser_plugin_guest_ &&
-        BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+    if (guest_mode::IsCrossProcessFrameGuest(this)) {
       view_.reset(new WebContentsViewChildFrame(
           this, delegate, &render_view_host_delegate_view_));
     } else {
       view_.reset(CreateWebContentsView(this, delegate,
                                         &render_view_host_delegate_view_));
     }
   }
 
   if (browser_plugin_guest_ &&

[Charlie Reis, 2016/09/07 00:22:29]

Why does this still have the browser_plugin_guest_ null check when the previous
one doesn't?

[EhsanK, 2016/09/08 18:14:58]

The null check is inherent to the method call. So the call to
guest_mode::IsCrossProcessFrameGuest(wc) returns true if
1) |wc| is a guest (has |browser_plugin_guest_|
2) |wc| is OOPIF, i.e., we have the switch AND |wc| is not a
MimeHandlerViewGuest's web contents.

So when the method returns false, the web contents is either not guest or it is
a guest but not OOPIF.

[Charlie Reis, 2016/09/15 20:56:10]

That doesn't answer why line 1563 is missing the null check.  If it's needed
here, I would imagine it's needed there as well.

[EhsanK, 2016/09/21 21:34:53]

On line 1563, the call to guest_mode::IsCrossProcessFrameGuest(this) checks if
|this->browser_plugin_guest_|). So it is not needed to check again.

But here, when the method returns false we still don't know if it was because
our guest was not OOPIF, or we did not have guest at all. So we check for
|browser_plugin_guest_| to confirm that the former case is valid.

[Charlie Reis, 2016/09/21 22:18:21]

Oh, I see now.  Thanks.

-      !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+      !guest_mode::IsCrossProcessFrameGuest(this)) {
     view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
                                          std::move(view_),
                                          &render_view_host_delegate_view_));
   }
   CHECK(render_view_host_delegate_view_);
   CHECK(view_.get());
 
   gfx::Size initial_size = params.initial_size;
   view_->CreateView(initial_size, params.context);
 
@@ skipping 2584 matching lines @@
     return delegate_->GetRootWindowResizerRect();
   return gfx::Rect();
 }
 
 void WebContentsImpl::RemoveBrowserPluginEmbedder() {
   if (browser_plugin_embedder_)
     browser_plugin_embedder_.reset();
 }
 
 WebContentsImpl* WebContentsImpl::GetOuterWebContents() {
-  if (BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
-    if (node_)
-      return node_->outer_web_contents();
-  } else {
-    if (GetBrowserPluginGuest())
-      return GetBrowserPluginGuest()->embedder_web_contents();
-  }
+  if (guest_mode::IsCrossProcessFrameGuest(this) && node_)
+    return node_->outer_web_contents();
+
+  if (browser_plugin_guest_)
+    return browser_plugin_guest_->embedder_web_contents();
+
   return nullptr;
 }
 
 WebContentsImpl* WebContentsImpl::GetFocusedWebContents() {
   // There is no inner or outer web contents.
   if (!node_ && !GetBrowserPluginGuest())
     return this;
 
   // We may need to create a node_ on the outermost contents in the
   // BrowserPlugin case.
@@ skipping 409 matching lines @@
 
 void WebContentsImpl::EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) {
   WebContentsImpl* source_web_contents = static_cast<WebContentsImpl*>(
       WebContents::FromRenderFrameHost(source_rfh));
 
   if (source_web_contents) {
     // If this message is going to outer WebContents from inner WebContents,
     // then we should not create a RenderView. AttachToOuterWebContentsFrame()
     // already created a RenderFrameProxyHost for that purpose.
     if (GetBrowserPluginEmbedder() &&
-        BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+        guest_mode::IsCrossProcessFrameGuest(source_web_contents)) {
       return;
     }
 
     if (this != source_web_contents && GetBrowserPluginGuest()) {
       // We create a RenderFrameProxyHost for the embedder in the guest's render
       // process but we intentionally do not expose the embedder's opener chain
       // to it.
       source_web_contents->GetRenderManager()->CreateRenderFrameProxy(
           GetSiteInstance());
     } else {
@@ skipping 580 matching lines @@
   for (RenderViewHost* render_view_host : render_view_host_set)
     render_view_host->OnWebkitPreferencesChanged();
 }
 
 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
     JavaScriptDialogManager* dialog_manager) {
   dialog_manager_ = dialog_manager;
 }
 
 }  // namespace content