Switching to CompositorFrameSinkSupport in android_webview::SurfacesInstance

android_webview/browser/surfaces_instance.cc

 // Copyright 2016 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 "android_webview/browser/surfaces_instance.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/aw_render_thread_context_provider.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/parent_output_surface.h"
 #include "base/memory/ptr_util.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/scheduler/begin_frame_source.h"
+#include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 namespace android_webview {
@@ skipping 15 matching lines @@
 
   // Should be kept in sync with compositor_impl_android.cc.
   settings.allow_antialiasing = false;
   settings.highp_threshold_min = 2048;
 
   // Webview does not own the surface so should not clear it.
   settings.should_clear_root_render_pass = false;
 
   surface_manager_.reset(new cc::SurfaceManager);
   surface_id_allocator_.reset(new cc::SurfaceIdAllocator());
-  surface_manager_->RegisterFrameSinkId(frame_sink_id_);
-  surface_factory_.reset(
-      new cc::SurfaceFactory(frame_sink_id_, surface_manager_.get(), this));
 
-  begin_frame_source_.reset(new cc::StubBeginFrameSource);
+  auto begin_frame_source = base::MakeUnique<cc::StubBeginFrameSource>();
   std::unique_ptr<cc::TextureMailboxDeleter> texture_mailbox_deleter(
       new cc::TextureMailboxDeleter(nullptr));
   std::unique_ptr<ParentOutputSurface> output_surface_holder(
       new ParentOutputSurface(AwRenderThreadContextProvider::Create(
           make_scoped_refptr(new AwGLSurface),
           DeferredGpuCommandService::GetInstance())));
   output_surface_ = output_surface_holder.get();
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
       nullptr, output_surface_holder->capabilities().max_frames_pending));
-  display_.reset(new cc::Display(
+
+  auto display = base::MakeUnique<cc::Display>(
       nullptr /* shared_bitmap_manager */,
       nullptr /* gpu_memory_buffer_manager */, settings, frame_sink_id_,
-      begin_frame_source_.get(), std::move(output_surface_holder),
-      std::move(scheduler), std::move(texture_mailbox_deleter)));
-  display_->Initialize(this, surface_manager_.get());
-  display_->SetVisible(true);
+      begin_frame_source.get(), std::move(output_surface_holder),
+      std::move(scheduler), std::move(texture_mailbox_deleter));
+
+  support_.reset(new cc::CompositorFrameSinkSupport(
+      nullptr, surface_manager_.get(), frame_sink_id_, std::move(display),
+      std::move(begin_frame_source)));
 
   DCHECK(!g_surfaces_instance);
   g_surfaces_instance = this;
 
 }
 
 SurfacesInstance::~SurfacesInstance() {
   DCHECK_EQ(g_surfaces_instance, this);
   g_surfaces_instance = nullptr;
 
   DCHECK(child_ids_.empty());
-  surface_factory_->EvictSurface();
-
-  surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
+  support_->EvictFrame();
 }
 
 void SurfacesInstance::DisplayOutputSurfaceLost() {
   // Android WebView does not handle context loss.
   LOG(FATAL) << "Render thread context loss";
 }
 
+void SurfacesInstance::ReclaimResources(
+    const cc::ReturnedResourceArray& resources) {
+  // Root surface should have no resources to return.
+  CHECK(resources.empty());
+}
+
 cc::FrameSinkId SurfacesInstance::AllocateFrameSinkId() {
   return cc::FrameSinkId(next_client_id_++, 0 /* sink_id */);
 }
 
 cc::SurfaceManager* SurfacesInstance::GetSurfaceManager() {
   return surface_manager_.get();
 }
 
 void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
                                    const gfx::Rect& clip,
@@ skipping 20 matching lines @@
 
   cc::SurfaceDrawQuad* surface_quad =
       render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_bounds),
                        gfx::Rect(quad_state->quad_layer_bounds), child_id);
 
   cc::CompositorFrame frame;
   frame.render_pass_list.push_back(std::move(render_pass));
   frame.metadata.referenced_surfaces = child_ids_;
 
-  if (!root_id_.is_valid()) {
+  if (!root_id_.is_valid())
     root_id_ = surface_id_allocator_->GenerateId();
-    display_->SetLocalFrameId(root_id_, 1.f);
-  }
-  surface_factory_->SubmitCompositorFrame(root_id_, std::move(frame),
-                                          cc::SurfaceFactory::DrawCallback());
 
-  display_->Resize(viewport);
-  display_->DrawAndSwap();
+  support_->SubmitCompositorFrame(root_id_, std::move(frame));
+
+  support_->display()->Resize(viewport);
+  support_->display()->DrawAndSwap();
 }
 
 void SurfacesInstance::AddChildId(const cc::SurfaceId& child_id) {
   DCHECK(std::find(child_ids_.begin(), child_ids_.end(), child_id) ==
          child_ids_.end());
   child_ids_.push_back(child_id);
   if (root_id_.is_valid())
     SetEmptyRootFrame();
 }
 
 void SurfacesInstance::RemoveChildId(const cc::SurfaceId& child_id) {
   auto itr = std::find(child_ids_.begin(), child_ids_.end(), child_id);
   DCHECK(itr != child_ids_.end());
   child_ids_.erase(itr);
   if (root_id_.is_valid())
     SetEmptyRootFrame();
 }
 
 void SurfacesInstance::SetEmptyRootFrame() {
   cc::CompositorFrame empty_frame;
   empty_frame.metadata.referenced_surfaces = child_ids_;
-  surface_factory_->SubmitCompositorFrame(root_id_, std::move(empty_frame),
-                                          cc::SurfaceFactory::DrawCallback());
-}
-
-void SurfacesInstance::ReturnResources(
-    const cc::ReturnedResourceArray& resources) {
-  // Root surface should have no resources to return.
-  CHECK(resources.empty());
-}
-
-void SurfacesInstance::SetBeginFrameSource(
-    cc::BeginFrameSource* begin_frame_source) {
-  // Parent compsitor calls DrawAndSwap directly and doesn't use
-  // BeginFrameSource.
+  support_->SubmitCompositorFrame(root_id_, std::move(empty_frame));
 }
 
 }  // namespace android_webview