Revert of Remove SurfaceFactory::Create and SurfaceFactory::Destroy

services/ui/ws/gpu_compositor_frame_sink.cc

 // Copyright 2015 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 "services/ui/ws/gpu_compositor_frame_sink.h"
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 34 matching lines @@
                                                                this);
 
   if (widget != gfx::kNullAcceleratedWidget)
     InitDisplay(widget, gpu_memory_buffer_manager, std::move(context_provider));
 }
 
 GpuCompositorFrameSink::~GpuCompositorFrameSink() {
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
-  surface_factory_.EvictSurface();
+  surface_factory_.DestroyAll();
   display_compositor_->manager()->UnregisterSurfaceFactoryClient(
       frame_sink_id_);
   display_compositor_->manager()->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void GpuCompositorFrameSink::SetNeedsBeginFrame(bool needs_begin_frame) {
   needs_begin_frame_ = needs_begin_frame;
   UpdateNeedsBeginFramesInternal();
 }
 
 void GpuCompositorFrameSink::SubmitCompositorFrame(cc::CompositorFrame frame) {
   gfx::Size frame_size = frame.render_pass_list[0]->output_rect.size();
   // If the size of the CompostiorFrame has changed then destroy the existing
   // Surface and create a new one of the appropriate size.
   if (!local_frame_id_.is_valid() || frame_size != last_submitted_frame_size_) {
+    if (local_frame_id_.is_valid())
+      surface_factory_.Destroy(local_frame_id_);
     local_frame_id_ = surface_id_allocator_.GenerateId();
+    surface_factory_.Create(local_frame_id_);
     if (display_)
       display_->Resize(frame_size);
   }
   ++ack_pending_count_;
   surface_factory_.SubmitCompositorFrame(
       local_frame_id_, std::move(frame),
       base::Bind(&GpuCompositorFrameSink::DidReceiveCompositorFrameAck,
                  base::Unretained(this)));
   if (display_) {
     display_->SetLocalFrameId(local_frame_id_,
@@ skipping 127 matching lines @@
 
   added_frame_observer_ = needs_begin_frame_;
   if (needs_begin_frame_)
     begin_frame_source_->AddObserver(this);
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 }  // namespace ws
 }  // namespace ui