Introducing SurfaceReferenceFactory

ui/android/delegated_frame_host_android.cc

Index: ui/android/delegated_frame_host_android.cc
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc
index f9f6e448cb34a7e4144f9cb698aaa667db100b39..19500f07250aeb6eb72b217042c3c7fdc6125fb3 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -10,6 +10,7 @@
 #include "cc/layers/surface_layer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_result.h"
+#include "cc/surfaces/direct_surface_embedding.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_id_allocator.h"
@@ -25,34 +26,16 @@ namespace ui {
 
 namespace {
 
-void SatisfyCallback(cc::SurfaceManager* manager,
-                     const cc::SurfaceSequence& sequence) {
-  std::vector<uint32_t> sequences;
-  sequences.push_back(sequence.sequence);
-  manager->DidSatisfySequences(sequence.frame_sink_id, &sequences);
-}
-
-void RequireCallback(cc::SurfaceManager* manager,
-                     const cc::SurfaceId& id,
-                     const cc::SurfaceSequence& sequence) {
-  cc::Surface* surface = manager->GetSurfaceForId(id);
-  if (!surface) {
-    LOG(ERROR) << "Attempting to require callback on nonexistent surface";
-    return;
-  }
-  surface->AddDestructionDependency(sequence);
-}
-
 scoped_refptr<cc::SurfaceLayer> CreateSurfaceLayer(
     cc::SurfaceManager* surface_manager,
     cc::SurfaceId surface_id,
     const gfx::Size surface_size,
     bool surface_opaque) {
   // manager must outlive compositors using it.
-  scoped_refptr<cc::SurfaceLayer> layer = cc::SurfaceLayer::Create(
-      base::Bind(&SatisfyCallback, base::Unretained(surface_manager)),
-      base::Bind(&RequireCallback, base::Unretained(surface_manager)));
-  layer->SetSurfaceId(surface_id, 1.f, surface_size);
+  scoped_refptr<cc::SurfaceLayer> layer = cc::SurfaceLayer::Create();
+  auto surface_ref = base::MakeUnique<cc::DirectSurfaceEmbedding>(
+      cc::SurfaceInfo(surface_id, 1.f, surface_size), surface_manager);
+  layer->SetSurfaceEmbedding(std::move(surface_ref));
   layer->SetBounds(surface_size);
   layer->SetIsDrawable(true);
   layer->SetContentsOpaque(surface_opaque);