<webview>: Make contentWindow available prior to attachment (on display:none).

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 <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 3129 matching lines @@
   }
 }
 
 void WebContentsImpl::OnPpapiBrokerPermissionResult(int routing_id,
                                                     bool result) {
   Send(new ViewMsg_PpapiBrokerPermissionResult(routing_id, result));
 }
 
 void WebContentsImpl::OnBrowserPluginMessage(RenderFrameHost* render_frame_host,
                                              const IPC::Message& message) {
-  // This creates a BrowserPluginEmbedder, which handles all the BrowserPlugin
-  // specific messages for this WebContents. This means that any message from
-  // a BrowserPlugin prior to this will be ignored.
-  // For more info, see comment above classes BrowserPluginEmbedder and
-  // BrowserPluginGuest.
-  CHECK(!browser_plugin_embedder_.get());

[Charlie Reis, 2015/03/04 20:08:36]

Why not keep this CHECK before the CreateBrowserPluginEmbedderIfNecessary()
call?  It seems like that's still expected.

[Fady Samuel, 2015/03/05 20:56:23]

Good point. If a BrowserPluginEmbedder already exists then we shouldn't be going
through this code path.

-  browser_plugin_embedder_.reset(BrowserPluginEmbedder::Create(this));
+  CreateBrowserPluginEmbedderIfNecessary();
   browser_plugin_embedder_->OnMessageReceived(message, render_frame_host);
 }
 #endif  // defined(ENABLE_PLUGINS)
 
 void WebContentsImpl::OnDidDownloadImage(
     int id,
     int http_status_code,
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
@@ skipping 814 matching lines @@
     RenderViewHost* rvh,
     const ViewMsg_PostMessage_Params& params) {
   // Only deliver the message to the active RenderViewHost if the request
   // came from a RenderViewHost in the same BrowsingInstance or if this
   // WebContents is dedicated to a browser plugin guest.
   // Note: This check means that an embedder could theoretically receive a
   // postMessage from anyone (not just its own guests). However, this is
   // probably not a risk for apps since other pages won't have references
   // to App windows.
   if (!rvh->GetSiteInstance()->IsRelatedSiteInstance(GetSiteInstance()) &&
-      !GetBrowserPluginGuest() && !GetBrowserPluginEmbedder())
+      !GetBrowserPluginGuest() && !GetBrowserPluginEmbedder()) {

[Charlie Reis, 2015/03/04 20:08:36]

This change isn't necessary, and it's not related to the rest.  Let's not add
churn here.

(Braces are optional for multi-line conditionals, as long as the body is a
single line.)

[Fady Samuel, 2015/03/05 20:56:23]

Done.

     return;
+  }
 
   ViewMsg_PostMessage_Params new_params(params);
 
   // If there is a source_routing_id, translate it to the routing ID for
   // the equivalent swapped out RVH in the target process.  If we need
   // to create a swapped out RVH for the source tab, we create its opener
   // chain as well, since those will also be accessible to the target page.
   if (new_params.source_routing_id != MSG_ROUTING_NONE) {
     // Try to look up the WebContents for the source page.
     WebContentsImpl* source_contents = NULL;
@@ skipping 433 matching lines @@
 
 void WebContentsImpl::SetBrowserPluginGuest(BrowserPluginGuest* guest) {
   CHECK(!browser_plugin_guest_);
   browser_plugin_guest_.reset(guest);
 }
 
 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const {
   return browser_plugin_embedder_.get();
 }
 
+void WebContentsImpl::CreateBrowserPluginEmbedderIfNecessary() {
+  if (browser_plugin_embedder_)
+    return;
+  browser_plugin_embedder_.reset(BrowserPluginEmbedder::Create(this));
+}
+
 void WebContentsImpl::ClearPowerSaveBlockers(
     RenderFrameHost* render_frame_host) {
   RemoveAllMediaPlayerEntries(render_frame_host, &active_audio_players_);
   RemoveAllMediaPlayerEntries(render_frame_host, &active_video_players_);
   MaybeReleasePowerSaveBlockers();
 }
 
 void WebContentsImpl::ClearAllPowerSaveBlockers() {
   active_audio_players_.clear();
   active_video_players_.clear();
@@ skipping 73 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content