Getting rid of CompositorFrameMetadata::satisfies_sequences

blimp/client/core/compositor/blimp_compositor.cc

Index: blimp/client/core/compositor/blimp_compositor.cc
diff --git a/blimp/client/core/compositor/blimp_compositor.cc b/blimp/client/core/compositor/blimp_compositor.cc
index edafad482814c074fa7fddfe9e1c665d7a0e44df..423de522f4cc601e828226a907850c9966658bbd 100644
--- a/blimp/client/core/compositor/blimp_compositor.cc
+++ b/blimp/client/core/compositor/blimp_compositor.cc
@@ -40,16 +40,19 @@ namespace client {
 
 namespace {
 
-void SatisfyCallback(cc::SurfaceManager* manager,
+void SatisfyCallback(base::WeakPtr<cc::SurfaceManager> manager,
                      const cc::SurfaceSequence& sequence) {
+  if (!manager)
+    return;
   std::vector<uint32_t> sequences;
   sequences.push_back(sequence.sequence);
   manager->DidSatisfySequences(sequence.frame_sink_id, &sequences);
 }
 
-void RequireCallback(cc::SurfaceManager* manager,
+void RequireCallback(base::WeakPtr<cc::SurfaceManager> manager,
                      const cc::SurfaceId& id,
                      const cc::SurfaceSequence& sequence) {
+  DCHECK(manager);
   cc::Surface* surface = manager->GetSurfaceForId(id);
   if (!surface) {
     LOG(ERROR) << "Attempting to require callback on nonexistent surface";
@@ -330,8 +333,8 @@ void BlimpCompositor::SubmitCompositorFrame(cc::CompositorFrame frame) {
     cc::SurfaceManager* surface_manager =
         GetEmbedderDeps()->GetSurfaceManager();
     scoped_refptr<cc::SurfaceLayer> content_layer = cc::SurfaceLayer::Create(
-        base::Bind(&SatisfyCallback, base::Unretained(surface_manager)),
-        base::Bind(&RequireCallback, base::Unretained(surface_manager)));
+        base::Bind(&SatisfyCallback, surface_manager->GetWeakPtr()),
+        base::Bind(&RequireCallback, surface_manager->GetWeakPtr()));
     content_layer->SetSurfaceId(
         cc::SurfaceId(surface_factory_->frame_sink_id(), local_frame_id_), 1.f,
         surface_size);