Getting rid of CompositorFrameMetadata::satisfies_sequences

blimp/client/core/compositor/blimp_compositor.cc

 // Copyright 2015 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 "blimp/client/core/compositor/blimp_compositor.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 22 matching lines @@
 #include "cc/trees/layer_tree_host_in_process.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "net/base/net_errors.h"
 #include "ui/gl/gl_surface.h"
 
 namespace blimp {
 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) {
+  if (!manager)
+    return;
   cc::Surface* surface = manager->GetSurfaceForId(id);
   if (!surface) {
     LOG(ERROR) << "Attempting to require callback on nonexistent surface";
     return;
   }
   surface->AddDestructionDependency(sequence);
 }
 
 }  // namespace
 
@@ skipping 260 matching lines @@
     DestroyDelegatedContent();
     DCHECK(layer_->children().empty());
 
     local_frame_id_ = surface_id_allocator_->GenerateId();
     current_surface_size_ = surface_size;
 
     // manager must outlive compositors using it.
     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);
     content_layer->SetBounds(current_surface_size_);
     content_layer->SetIsDrawable(true);
     content_layer->SetContentsOpaque(true);
 
     layer_->AddChild(content_layer);
   }
 
@@ skipping 115 matching lines @@
   // Destroy the old LayerTreeHost state.
   host_.reset();
 
   // Cancel any outstanding CompositorFrameSink requests.  That way if we get an
   // async callback related to the old request we know to drop it.
   compositor_frame_sink_request_pending_ = false;
 }
 
 }  // namespace client
 }  // namespace blimp