Force new surface on BrowserPluginGuest reattach.

content/browser/browser_plugin/browser_plugin_guest.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/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
@@ skipping 60 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(EmbedderVisibilityObserver);
 };
 
 BrowserPluginGuest::BrowserPluginGuest(bool has_render_view,
                                        WebContentsImpl* web_contents,
                                        BrowserPluginGuestDelegate* delegate)
     : WebContentsObserver(web_contents),
       owner_web_contents_(nullptr),
       attached_(false),
+      has_attached_since_surface_set_(false),
       browser_plugin_instance_id_(browser_plugin::kInstanceIDNone),
       focused_(false),
       mouse_locked_(false),
       pending_lock_request_(false),
       guest_visible_(false),
       embedder_visible_(true),
       is_full_page_plugin_(false),
       has_render_view_(has_render_view),
       is_in_destruction_(false),
       initialized_(false),
@@ skipping 306 matching lines @@
   SendMessageToEmbedder(
       new BrowserPluginMsg_CompositorFrameSwapped(
           browser_plugin_instance_id(), *last_pending_frame_));
 }
 
 void BrowserPluginGuest::SetChildFrameSurface(
     const cc::SurfaceId& surface_id,
     const gfx::Size& frame_size,
     float scale_factor,
     const cc::SurfaceSequence& sequence) {
+  has_attached_since_surface_set_ = false;
   SendMessageToEmbedder(new BrowserPluginMsg_SetChildFrameSurface(
       browser_plugin_instance_id(), surface_id, frame_size, scale_factor,
       sequence));
 }
 
 void BrowserPluginGuest::OnSatisfySequence(
     int instance_id,
     const cc::SurfaceSequence& sequence) {
   std::vector<uint32_t> sequences;
   sequences.push_back(sequence.sequence);
@@ skipping 43 matching lines @@
   screen_pos += guest_window_rect_.OffsetFromOrigin();
   if (embedder_web_contents()->GetBrowserPluginGuest()) {
      BrowserPluginGuest* embedder_guest =
         embedder_web_contents()->GetBrowserPluginGuest();
      screen_pos += embedder_guest->guest_window_rect_.OffsetFromOrigin();
   }
   return screen_pos;
 }
 
 void BrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
-  if (!attached()) {
+  // During tests, attache() may be true when there is no owner_web_contents_;
+  // in this case just queue any messages we receive.
+  if (!attached() || !owner_web_contents_) {
     // Some pages such as data URLs, javascript URLs, and about:blank
     // do not load external resources and so they load prior to attachment.
     // As a result, we must save all these IPCs until attachment and then
     // forward them so that the embedder gets a chance to see and process
     // the load events.
     pending_messages_.push_back(linked_ptr<IPC::Message>(msg));
     return;
   }
   owner_web_contents_->Send(msg);
 }
@@ skipping 223 matching lines @@
         static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
     if (!web_contents()->GetRenderViewHost()->GetView()) {
       web_contents_view->CreateViewForWidget(
           web_contents()->GetRenderViewHost(), true);
     }
   }
 
   InitInternal(params, embedder_web_contents);
 
   attached_ = true;
+  has_attached_since_surface_set_ = true;
   SendQueuedMessages();
 
   delegate_->DidAttach(GetGuestProxyRoutingID());
 
   has_render_view_ = true;
 
   // Enable input method for guest if it's enabled for the embedder.
   if (static_cast<RenderViewHostImpl*>(
       owner_web_contents_->GetRenderViewHost())->input_method_active()) {
     RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>(
@@ skipping 245 matching lines @@
 void BrowserPluginGuest::OnImeCompositionRangeChanged(
       const gfx::Range& range,
       const std::vector<gfx::Rect>& character_bounds) {
   static_cast<RenderWidgetHostViewBase*>(
       web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged(
           range, character_bounds);
 }
 #endif
 
 }  // namespace content