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

extensions/browser/guest_view/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 "extensions/browser/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/ui/zoom/page_zoom.h"
 #include "components/ui/zoom/zoom_controller.h"
@@ skipping 135 matching lines @@
 GuestViewBase::GuestViewBase(content::WebContents* owner_web_contents)
     : owner_web_contents_(owner_web_contents),
       browser_context_(owner_web_contents->GetBrowserContext()),
       guest_instance_id_(
           GuestViewManager::FromBrowserContext(browser_context_)->
               GetNextInstanceID()),
       view_instance_id_(guestview::kInstanceIDNone),
       element_instance_id_(guestview::kInstanceIDNone),
       initialized_(false),
       is_being_destroyed_(false),
-      guest_sizer_(nullptr),
+      guest_proxy_host_(nullptr),

[Charlie Reis, 2015/03/09 21:25:22]

You need to initialize guest_proxy_routing_id_ to MSG_ROUTING_NONE.

[Fady Samuel, 2015/03/09 23:02:42]

Done.

       auto_size_enabled_(false),
       is_full_page_plugin_(false),
       weak_ptr_factory_(this) {
 }
 
 void GuestViewBase::Init(const base::DictionaryValue& create_params,
                          const WebContentsCreatedCallback& callback) {
   if (initialized_)
     return;
   initialized_ = true;
@@ skipping 58 matching lines @@
   create_params.GetInteger(guestview::kParameterInstanceId,
                            &view_instance_id_);
 
   if (CanRunInDetachedState())
     SetUpSizing(create_params);
 
   // Give the derived class an opportunity to perform additional initialization.
   DidInitialize(create_params);
 }
 
+void GuestViewBase::LoadURLWithParams(

[Charlie Reis, 2015/03/09 21:25:22]

Can this get called multiple times?  We don't want the guest_proxy_routing_id_
to change over time, so maybe we should have a DCHECK to that effect.

[Fady Samuel, 2015/03/09 23:02:41]

Done.

+      const content::NavigationController::LoadURLParams& load_params) {
+  guest_proxy_routing_id_ = proxy_host()->LoadURLWithParams(load_params);

[Charlie Reis, 2015/03/09 18:52:59]

If we can get the routing ID from the GuestProxyHost, then I don't see why we
need LoadURLWithParams to return the routing ID.

[Charlie Reis, 2015/03/09 21:25:22]

Disregard.  Only makes sense in Option 2.

[Fady Samuel, 2015/03/09 23:02:41]

Done.

[Fady Samuel, 2015/03/09 23:02:41]

Done.

+}
+
 void GuestViewBase::DispatchOnResizeEvent(const gfx::Size& old_size,
                                           const gfx::Size& new_size) {
   if (new_size == old_size)
     return;
 
   // Dispatch the onResize event.
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   args->SetInteger(guestview::kOldWidth, old_size.width());
   args->SetInteger(guestview::kOldHeight, old_size.height());
   args->SetInteger(guestview::kNewWidth, new_size.width());
@@ skipping 39 matching lines @@
     } else {
       new_size = gfx::Size(guestview::kDefaultWidth, guestview::kDefaultHeight);
     }
 
     if (auto_size_enabled_) {
       // Autosize was previously enabled.
       rvh->DisableAutoResize(new_size);
       GuestSizeChangedDueToAutoSize(guest_size_, new_size);
     } else {
       // Autosize was already disabled.
-      guest_sizer_->SizeContents(new_size);
+      guest_proxy_host_->SizeContents(new_size);
     }
 
     DispatchOnResizeEvent(guest_size_, new_size);
     guest_size_ = new_size;
   }
 
   auto_size_enabled_ = enable_auto_size;
 }
 
 // static
@@ skipping 67 matching lines @@
 content::WebContents* GuestViewBase::CreateNewGuestWindow(
     const content::WebContents::CreateParams& create_params) {
   auto guest_manager = GuestViewManager::FromBrowserContext(browser_context());
   return guest_manager->CreateGuestWithWebContentsParams(
       GetViewType(),
       owner_web_contents(),
       create_params);
 }
 
 void GuestViewBase::DidAttach(int guest_proxy_routing_id) {
+  guest_proxy_routing_id_ = guest_proxy_routing_id;

[Charlie Reis, 2015/03/09 21:25:22]

Similar DCHECK to make sure it doesn't change after initial assignment?

[Fady Samuel, 2015/03/09 23:02:42]

Done.

+
   opener_lifetime_observer_.reset();
 
   SetUpSizing(*attach_params());
 
   // 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_,
@@ skipping 25 matching lines @@
 const GURL& GuestViewBase::GetOwnerSiteURL() const {
   return owner_web_contents()->GetLastCommittedURL();
 }
 
 void GuestViewBase::Destroy() {
   if (is_being_destroyed_)
     return;
 
   is_being_destroyed_ = true;
 
-  guest_sizer_ = nullptr;
-
   // It is important to clear owner_web_contents_ after the call to
   // StopTrackingEmbedderZoomLevel(), but before the rest of
   // the statements in this function.
   StopTrackingEmbedderZoomLevel();
   owner_web_contents_ = nullptr;
 
   DCHECK(web_contents());
 
   // Give the derived class an opportunity to perform some cleanup.
   WillDestroy();
 
   // Invalidate weak pointers now so that bound callbacks cannot be called late
   // into destruction. We must call this after WillDestroy because derived types
   // may wish to access their openers.
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   // Give the content module an opportunity to perform some cleanup.
-  if (!destruction_callback_.is_null())
-    destruction_callback_.Run();
+  guest_proxy_host_->WillDestroy();
+  guest_proxy_host_ = nullptr;
 
   webcontents_guestview_map.Get().erase(web_contents());
   GuestViewManager::FromBrowserContext(browser_context_)->
       RemoveGuest(guest_instance_id_);
   pending_events_.clear();
 
   delete web_contents();
 }
 
 void GuestViewBase::SetAttachParams(const base::DictionaryValue& params) {
   attach_params_.reset(params.DeepCopy());
   attach_params_->GetInteger(guestview::kParameterInstanceId,
                              &view_instance_id_);
 }
 
 void GuestViewBase::SetOpener(GuestViewBase* guest) {
   if (guest && guest->IsViewType(GetViewType())) {
     opener_ = guest->weak_ptr_factory_.GetWeakPtr();
     if (!attached())
       opener_lifetime_observer_.reset(new OpenerLifetimeObserver(this));
     return;
   }
   opener_ = base::WeakPtr<GuestViewBase>();
   opener_lifetime_observer_.reset();
 }
 
-void GuestViewBase::RegisterDestructionCallback(
-    const DestructionCallback& callback) {
-  destruction_callback_ = callback;
-}
-
-void GuestViewBase::SetGuestSizer(content::GuestSizer* guest_sizer) {
-  guest_sizer_ = guest_sizer;
+void GuestViewBase::SetGuestProxyHost(
+    content::GuestProxyHost* guest_proxy_host) {
+  guest_proxy_host_ = guest_proxy_host;
 }
 
 void GuestViewBase::WillAttach(content::WebContents* embedder_web_contents,
                                int element_instance_id,
                                bool is_full_page_plugin) {
   if (owner_web_contents_ != embedder_web_contents) {
     DCHECK_EQ(owner_lifetime_observer_->web_contents(), owner_web_contents_);
     // Stop tracking the old embedder's zoom level.
     StopTrackingEmbedderZoomLevel();
     owner_web_contents_ = embedder_web_contents;
@@ skipping 322 matching lines @@
 void GuestViewBase::RegisterGuestViewTypes() {
   AppViewGuest::Register();
   ExtensionOptionsGuest::Register();
   ExtensionViewGuest::Register();
   MimeHandlerViewGuest::Register();
   SurfaceWorkerGuest::Register();
   WebViewGuest::Register();
 }
 
 }  // namespace extensions