exo::CompositorFrameSinkHolder's release callbacks hold ref

components/exo/compositor_frame_sink_holder.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 "components/exo/compositor_frame_sink_holder.h"
 
-#include "base/memory/ptr_util.h"
 #include "cc/resources/returned_resource.h"
 #include "components/exo/surface.h"
 
 namespace exo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // CompositorFrameSinkHolder, public:
 
 CompositorFrameSinkHolder::CompositorFrameSinkHolder(
     Surface* surface,
     std::unique_ptr<CompositorFrameSink> frame_sink,
     cc::mojom::MojoCompositorFrameSinkClientRequest request)
     : surface_(surface),
       frame_sink_(std::move(frame_sink)),
       begin_frame_source_(base::MakeUnique<cc::ExternalBeginFrameSource>(this)),
       binding_(this, std::move(request)),
       weak_factory_(this) {
   surface_->AddSurfaceObserver(this);
 }
 
 bool CompositorFrameSinkHolder::HasReleaseCallbackForResource(
     cc::ResourceId id) {
   return release_callbacks_.find(id) != release_callbacks_.end();
 }
 
-void CompositorFrameSinkHolder::AddResourceReleaseCallback(
+void CompositorFrameSinkHolder::SetResourceReleaseCallback(
     cc::ResourceId id,
-    std::unique_ptr<cc::SingleReleaseCallback> callback) {
-  release_callbacks_[id] = std::make_pair(this, std::move(callback));
+    const cc::ReleaseCallback& callback) {
+  DCHECK(callback);

[reveman, 2017/01/03 23:24:47]

nit: DCHECK(!callback.is_null())

[Alex Z., 2017/01/03 23:39:15]

Done.

+  release_callbacks_[id] = callback;
 }
 
 void CompositorFrameSinkHolder::ActivateFrameCallbacks(
     std::list<FrameCallback>* frame_callbacks) {
   active_frame_callbacks_.splice(active_frame_callbacks_.end(),
                                  *frame_callbacks);
   UpdateNeedsBeginFrame();
 }
 
 void CompositorFrameSinkHolder::CancelFrameCallbacks() {
@@ skipping 30 matching lines @@
     active_frame_callbacks_.pop_front();
   }
   begin_frame_source_->OnBeginFrame(args);
 }
 
 void CompositorFrameSinkHolder::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   for (auto& resource : resources) {
     auto it = release_callbacks_.find(resource.id);
     DCHECK(it != release_callbacks_.end());
-    std::unique_ptr<cc::SingleReleaseCallback> callback =
-        std::move(it->second.second);
-    release_callbacks_.erase(it);
-    callback->Run(resource.sync_token, resource.lost);
+    if (it != release_callbacks_.end()) {
+      it->second.Run(resource.sync_token, resource.lost);
+      release_callbacks_.erase(it);
+    }
   }
 }
 
 void CompositorFrameSinkHolder::WillDrawSurface() {
   if (surface_)
     surface_->WillDraw();
 
   UpdateNeedsBeginFrame();
 }
 
@@ skipping 18 matching lines @@
 // SurfaceObserver overrides:
 
 void CompositorFrameSinkHolder::OnSurfaceDestroying(Surface* surface) {
   surface_->RemoveSurfaceObserver(this);
   surface_ = nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExoComopositorFrameSink, private:
 
-CompositorFrameSinkHolder::~CompositorFrameSinkHolder() {}
+CompositorFrameSinkHolder::~CompositorFrameSinkHolder() {
+  if (surface_)
+    surface_->RemoveSurfaceObserver(this);
+}
 
 void CompositorFrameSinkHolder::UpdateNeedsBeginFrame() {
   if (!begin_frame_source_)
     return;
 
   bool needs_begin_frame = !active_frame_callbacks_.empty();
   if (needs_begin_frame == needs_begin_frame_)
     return;
 
   needs_begin_frame_ = needs_begin_frame;
   OnNeedsBeginFrames(needs_begin_frame_);
 }
 
 }  // namespace exo