Remove SurfaceFactory::Create and SurfaceFactory::Destroy

content/renderer/android/synchronous_compositor_frame_sink.cc

 // Copyright 2013 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/renderer/android/synchronous_compositor_frame_sink.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 30 matching lines @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 
 namespace content {
 
 namespace {
 
 const int64_t kFallbackTickTimeoutInMilliseconds = 100;
-const cc::FrameSinkId kFrameSinkId(1, 1);
+const cc::FrameSinkId kRootFrameSinkId(1, 1);
+const cc::FrameSinkId kChildFrameSinkId(1, 2);
 
 // Do not limit number of resources, so use an unrealistically high value.
 const size_t kNumResourcesLimit = 10 * 1000 * 1000;
 
 class SoftwareDevice : public cc::SoftwareOutputDevice {
  public:
   SoftwareDevice(SkCanvas** canvas) : canvas_(canvas) {}
 
   void Resize(const gfx::Size& pixel_size, float device_scale_factor) override {
     // Intentional no-op: canvas size is controlled by the embedder.
@@ skipping 53 matching lines @@
                               gpu_memory_buffer_manager,
                               nullptr),
       routing_id_(routing_id),
       compositor_frame_sink_id_(compositor_frame_sink_id),
       registry_(registry),
       sender_(RenderThreadImpl::current()->sync_compositor_message_filter()),
       memory_policy_(0u),
       frame_swap_message_queue_(frame_swap_message_queue),
       surface_manager_(new cc::SurfaceManager),
       surface_id_allocator_(new cc::SurfaceIdAllocator()),
-      surface_factory_(
-          new cc::SurfaceFactory(kFrameSinkId, surface_manager_.get(), this)),
+      root_factory_(new cc::SurfaceFactory(kRootFrameSinkId,
+                                           surface_manager_.get(),
+                                           this)),
+      child_factory_(new cc::SurfaceFactory(kChildFrameSinkId,
+                                            surface_manager_.get(),
+                                            this)),
       begin_frame_source_(std::move(begin_frame_source)) {
   DCHECK(registry_);
   DCHECK(sender_);
   DCHECK(begin_frame_source_);
   thread_checker_.DetachFromThread();
   memory_policy_.priority_cutoff_when_visible =
       gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE;
 }
 
 SynchronousCompositorFrameSink::~SynchronousCompositorFrameSink() = default;
@@ skipping 24 matching lines @@
     return false;
 
   DCHECK(begin_frame_source_);
   client_->SetBeginFrameSource(begin_frame_source_.get());
   client_->SetMemoryPolicy(memory_policy_);
   client_->SetTreeActivationCallback(
       base::Bind(&SynchronousCompositorFrameSink::DidActivatePendingTree,
                  base::Unretained(this)));
   registry_->RegisterCompositorFrameSink(routing_id_, this);
 
-  surface_manager_->RegisterFrameSinkId(kFrameSinkId);
-  surface_manager_->RegisterSurfaceFactoryClient(kFrameSinkId, this);
+  surface_manager_->RegisterFrameSinkId(kRootFrameSinkId);
+  surface_manager_->RegisterFrameSinkId(kChildFrameSinkId);
+  surface_manager_->RegisterSurfaceFactoryClient(kRootFrameSinkId, this);
+  surface_manager_->RegisterSurfaceFactoryClient(kChildFrameSinkId, this);
 
   cc::RendererSettings software_renderer_settings;
 
   auto output_surface = base::MakeUnique<SoftwareOutputSurface>(
       base::MakeUnique<SoftwareDevice>(&current_sw_canvas_));
   software_output_surface_ = output_surface.get();
 
   // The shared_bitmap_manager and gpu_memory_buffer_manager here are null as
   // this Display is only used for resourcesless software draws, where no
   // resources are included in the frame swapped from the compositor. So there
   // is no need for these.
   display_.reset(new cc::Display(
       nullptr /* shared_bitmap_manager */,
       nullptr /* gpu_memory_buffer_manager */, software_renderer_settings,
-      kFrameSinkId, nullptr /* begin_frame_source */, std::move(output_surface),
-      nullptr /* scheduler */, nullptr /* texture_mailbox_deleter */));
+      kRootFrameSinkId, nullptr /* begin_frame_source */,
+      std::move(output_surface), nullptr /* scheduler */,
+      nullptr /* texture_mailbox_deleter */));
   display_->Initialize(&display_client_, surface_manager_.get());
   display_->SetVisible(true);
   return true;
 }
 
 void SynchronousCompositorFrameSink::DetachFromClient() {
   DCHECK(CalledOnValidThread());
   client_->SetBeginFrameSource(nullptr);
   // Destroy the begin frame source on the same thread it was bound on.
   begin_frame_source_ = nullptr;
   registry_->UnregisterCompositorFrameSink(routing_id_, this);
   client_->SetTreeActivationCallback(base::Closure());
-  if (root_local_frame_id_.is_valid()) {
-    surface_factory_->Destroy(root_local_frame_id_);
-    surface_factory_->Destroy(child_local_frame_id_);
-  }
-  surface_manager_->UnregisterSurfaceFactoryClient(kFrameSinkId);
-  surface_manager_->InvalidateFrameSinkId(kFrameSinkId);
+  root_factory_->EvictSurface();
+  child_factory_->EvictSurface();
+  surface_manager_->UnregisterSurfaceFactoryClient(kRootFrameSinkId);
+  surface_manager_->UnregisterSurfaceFactoryClient(kChildFrameSinkId);
+  surface_manager_->InvalidateFrameSinkId(kRootFrameSinkId);
+  surface_manager_->InvalidateFrameSinkId(kChildFrameSinkId);
   software_output_surface_ = nullptr;
   display_ = nullptr;
-  surface_factory_ = nullptr;
+  child_factory_ = nullptr;
+  root_factory_ = nullptr;
   surface_id_allocator_ = nullptr;
   surface_manager_ = nullptr;
   cc::CompositorFrameSink::DetachFromClient();
   CancelFallbackTick();
 }
 
 static void NoOpDrawCallback() {}
 
 void SynchronousCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
@@ skipping 10 matching lines @@
 
   cc::CompositorFrame submit_frame;
 
   if (in_software_draw_) {
     // The frame we send to the client is actually just the metadata. Preserve
     // the |frame| for the software path below.
     submit_frame.metadata = frame.metadata.Clone();
 
     if (!root_local_frame_id_.is_valid()) {
       root_local_frame_id_ = surface_id_allocator_->GenerateId();
-      surface_factory_->Create(root_local_frame_id_);
       child_local_frame_id_ = surface_id_allocator_->GenerateId();
-      surface_factory_->Create(child_local_frame_id_);
     }
 
     display_->SetLocalFrameId(root_local_frame_id_,
                               frame.metadata.device_scale_factor);
 
     // The layer compositor should be giving a frame that covers the
     // |sw_viewport_for_current_draw_| but at 0,0.
     gfx::Size child_size = sw_viewport_for_current_draw_.size();
     DCHECK(gfx::Rect(child_size) == frame.render_pass_list.back()->output_rect);
 
@@ skipping 24 matching lines @@
 
     // The RenderPass has a single SurfaceDrawQuad (and SharedQuadState for it).
     auto* shared_quad_state =
         embed_render_pass->CreateAndAppendSharedQuadState();
     auto* surface_quad =
         embed_render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
     shared_quad_state->SetAll(
         child_transform, child_size, gfx::Rect(child_size),
         gfx::Rect() /* clip_rect */, false /* is_clipped */, 1.f /* opacity */,
         SkBlendMode::kSrcOver, 0 /* sorting_context_id */);
-    surface_quad->SetNew(shared_quad_state, gfx::Rect(child_size),
-                         gfx::Rect(child_size),
-                         cc::SurfaceId(kFrameSinkId, child_local_frame_id_));
+    surface_quad->SetNew(
+        shared_quad_state, gfx::Rect(child_size), gfx::Rect(child_size),
+        cc::SurfaceId(kChildFrameSinkId, child_local_frame_id_));
 
-    surface_factory_->SubmitCompositorFrame(
+    child_factory_->SubmitCompositorFrame(
         child_local_frame_id_, std::move(frame), base::Bind(&NoOpDrawCallback));
-    surface_factory_->SubmitCompositorFrame(root_local_frame_id_,
-                                            std::move(embed_frame),
-                                            base::Bind(&NoOpDrawCallback));
+    root_factory_->SubmitCompositorFrame(root_local_frame_id_,
+                                         std::move(embed_frame),
+                                         base::Bind(&NoOpDrawCallback));
     display_->DrawAndSwap();
   } else {
     // For hardware draws we send the whole frame to the client so it can draw
     // the content in it.
     submit_frame = std::move(frame);
   }
 
   sync_client_->SubmitCompositorFrame(compositor_frame_sink_id_,
                                       std::move(submit_frame));
   DeliverMessages();
@@ skipping 156 matching lines @@
   client_->ReclaimResources(resources);
 }
 
 void SynchronousCompositorFrameSink::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // Software output is synchronous and doesn't use a BeginFrameSource.
   NOTREACHED();
 }
 
 }  // namespace content