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 8ac7dad561240a8552e6d54aa3d510e89fea4008..1366276ee8737d25bfc36ded430a5d869a2b79b7 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -24,34 +24,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();
+  cc::SurfaceRefPtr surface_ref =
+      surface_manager->NewSurfaceRef(surface_id, 1.f, surface_size);

[Fady Samuel, 2016/11/30 19:51:29]

SurfaceManager will live in mus gpu and this SurfaceRef will live in the cilent
process. I don't think it should be surfacemanager dispensing this thing. I
think instead, we should have a type of SurfaceRef that takes in a
SurfaceManager. That might be OK for now.

+  layer->SetSurfaceRef(std::move(surface_ref));
   layer->SetBounds(surface_size);
   layer->SetIsDrawable(true);
   layer->SetContentsOpaque(surface_opaque);