Force new surface on BrowserPluginGuest reattach.

content/browser/frame_host/render_widget_host_view_child_frame.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 "content/browser/frame_host/render_widget_host_view_child_frame.h"
 
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_sequence.h"
@@ skipping 232 matching lines @@
 
   // Check whether we need to recreate the cc::Surface, which means the child
   // frame renderer has changed its output surface, or size, or scale factor.
   if (output_surface_id != last_output_surface_id_ && surface_factory_) {
     surface_factory_->Destroy(surface_id_);
     surface_factory_.reset();
   }
   if (output_surface_id != last_output_surface_id_ ||
       frame_size != current_surface_size_ ||
       scale_factor != current_surface_scale_factor_) {
-    if (surface_factory_ && !surface_id_.is_null())
-      surface_factory_->Destroy(surface_id_);
-    surface_id_ = cc::SurfaceId();
+    ClearCompositorSurfaceIfNecessary();
     last_output_surface_id_ = output_surface_id;
     current_surface_size_ = frame_size;
     current_surface_scale_factor_ = scale_factor;
   }
 
   if (!surface_factory_) {
     cc::SurfaceManager* manager = GetSurfaceManager();
     surface_factory_ = make_scoped_ptr(new cc::SurfaceFactory(manager, this));
   }
 
@@ skipping 145 matching lines @@
             std::back_inserter(surface_returned_resources_));
 }
 
 BrowserAccessibilityManager*
 RenderWidgetHostViewChildFrame::CreateBrowserAccessibilityManager(
     BrowserAccessibilityDelegate* delegate) {
   return BrowserAccessibilityManager::Create(
       BrowserAccessibilityManager::GetEmptyDocument(), delegate);
 }
 
+void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() {
+  if (surface_factory_ && !surface_id_.is_null())
+      surface_factory_->Destroy(surface_id_);

[lazyboy, 2015/06/26 18:03:21]

nit: indent

[wjmaclean, 2015/06/27 16:30:58]

Done.

+  surface_id_ = cc::SurfaceId();
+}
+
 }  // namespace content