Remove SurfaceFactory::Create and SurfaceFactory::Destroy

content/browser/frame_host/render_widget_host_view_guest.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_guest.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 270 matching lines @@
 
   cc::RenderPass* root_pass = frame.render_pass_list.back().get();
 
   gfx::Size frame_size = root_pass->output_rect.size();
   float scale_factor = frame.metadata.device_scale_factor;
 
   // 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 (compositor_frame_sink_id != last_compositor_frame_sink_id_ &&
       surface_factory_) {
-    surface_factory_->Destroy(local_frame_id_);
     surface_factory_.reset();
   }
   if (compositor_frame_sink_id != last_compositor_frame_sink_id_ ||
       frame_size != current_surface_size_ ||
       scale_factor != current_surface_scale_factor_ ||
       (guest_ && guest_->has_attached_since_surface_set())) {
     ClearCompositorSurfaceIfNecessary();
     last_compositor_frame_sink_id_ = compositor_frame_sink_id;
     current_surface_size_ = frame_size;
     current_surface_scale_factor_ = scale_factor;
   }
 
   if (!surface_factory_) {
     cc::SurfaceManager* manager = GetSurfaceManager();
     surface_factory_ =
         base::MakeUnique<cc::SurfaceFactory>(frame_sink_id_, manager, this);
   }
 
   if (local_frame_id_.is_null()) {
     local_frame_id_ = id_allocator_->GenerateId();
-    surface_factory_->Create(local_frame_id_);
+    surface_factory_->SubmitCompositorFrame(local_frame_id_,

[Fady Samuel, 2016/11/08 22:23:59]

I don't think this approach is correct. We shouldn't be submitting empty
compositorframes unless absolutely necessary. Move the destruction dependency
code after SubmitCompositorFrame.

[Saman Sami, 2016/11/11 17:49:58]

Done.

+                                            cc::CompositorFrame(),
+                                            cc::SurfaceFactory::DrawCallback());
 
     cc::SurfaceSequence sequence =
         cc::SurfaceSequence(frame_sink_id_, next_surface_sequence_++);
     // The renderer process will satisfy this dependency when it creates a
     // SurfaceLayer.
     cc::SurfaceManager* manager = GetSurfaceManager();
     cc::SurfaceId surface_id(frame_sink_id_, local_frame_id_);
     manager->GetSurfaceForId(surface_id)->AddDestructionDependency(sequence);
     // TODO(wjmaclean): I'm not sure what it means to create a surface id
     // without setting it on the child, though since we will in this case be
@@ skipping 365 matching lines @@
         gesture_event.data.scrollUpdate.inertialPhase ==
             blink::WebGestureEvent::MomentumPhase) {
       return;
     }
     host_->ForwardGestureEvent(gesture_event);
     return;
   }
 }
 
 }  // namespace content