exo::CompositorFrameSinkHolder's release callbacks hold ref

components/exo/buffer.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 "components/exo/buffer.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/output/context_provider.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/resources/texture_mailbox.h"
+#include "components/exo/compositor_frame_sink_holder.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ui/aura/env.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace exo {
 namespace {
 
 // The amount of time before we wait for release queries using
@@ skipping 357 matching lines @@
       texture_target_(texture_target),
       query_type_(query_type),
       use_zero_copy_(use_zero_copy),
       is_overlay_candidate_(is_overlay_candidate) {}
 
 Buffer::~Buffer() {}
 
 std::unique_ptr<cc::SingleReleaseCallback> Buffer::ProduceTextureMailbox(
     cc::TextureMailbox* texture_mailbox,
     bool secure_output_only,
-    bool client_usage) {
+    bool client_usage,
+    scoped_refptr<CompositorFrameSinkHolder> compositor_frame_sink_holder) {
   DCHECK(attach_count_);
   DLOG_IF(WARNING, use_count_ && client_usage)
       << "Producing a texture mailbox for a buffer that has not been released";
 
   // Some clients think that they can reuse a buffer before it's released by
   // performing a fast blit into the buffer. This behavior is bad as it prevents
   // the client from knowing when the buffer is actually released (e.g. the
   // release notification for the previous use of buffer can arrive after the
   // buffer has been reused). We stop running the release callback when this
   // type of behavior is detected as having the buffer always be busy will
@@ skipping 39 matching lines @@
 
     *texture_mailbox =
         cc::TextureMailbox(texture->mailbox(), sync_token, texture_target_,
                            gpu_memory_buffer_->GetSize(), is_overlay_candidate_,
                            secure_output_only);
     // The contents texture will be released when no longer used by the
     // compositor.
     return cc::SingleReleaseCallback::Create(
         base::Bind(&Buffer::Texture::ReleaseTexImage, base::Unretained(texture),
                    base::Bind(&Buffer::ReleaseContentsTexture, AsWeakPtr(),
-                              base::Passed(&contents_texture_))));
+                              base::Passed(&contents_texture_),
+                              (compositor_frame_sink_holder))));

[reveman, 2016/12/21 20:05:42]

s/(compositor_frame_sink_holder)/compositor_frame_sink_holder/

[Alex Z., 2016/12/21 22:35:33]

Done.

   }
 
   // Create a mailbox texture that we copy the buffer contents to.
   if (!texture_) {
     texture_ =
         base::MakeUnique<Texture>(context_factory, context_provider.get());
   }
 
   // Copy the contents of |contents_texture| to |texture| and produce a
   // texture mailbox from the result in |texture|.
   Texture* contents_texture = contents_texture_.get();
   Texture* texture = texture_.get();
 
   // The contents texture will be released when copy has completed.
   gpu::SyncToken sync_token = contents_texture->CopyTexImage(
       texture, base::Bind(&Buffer::ReleaseContentsTexture, AsWeakPtr(),
-                          base::Passed(&contents_texture_)));
+                          base::Passed(&contents_texture_), nullptr));
   *texture_mailbox =
       cc::TextureMailbox(texture->mailbox(), sync_token, GL_TEXTURE_2D,
                          gpu_memory_buffer_->GetSize(),
                          false /* is_overlay_candidate */, secure_output_only);
   // The mailbox texture will be released when no longer used by the
   // compositor.
-  return cc::SingleReleaseCallback::Create(
-      base::Bind(&Buffer::Texture::Release, base::Unretained(texture),
-                 base::Bind(&Buffer::ReleaseTexture, AsWeakPtr(),
-                            base::Passed(&texture_))));
+  return cc::SingleReleaseCallback::Create(base::Bind(
+      &Buffer::Texture::Release, base::Unretained(texture),
+      base::Bind(&Buffer::ReleaseTexture, AsWeakPtr(), base::Passed(&texture_),
+                 (compositor_frame_sink_holder))));
 }
 
 void Buffer::OnAttach() {
   DLOG_IF(WARNING, attach_count_ > 0u)
       << "Reattaching a buffer that is already attached to another surface.";
   attach_count_++;
 }
 
 void Buffer::OnDetach() {
   DCHECK_GT(attach_count_, 0u);
@@ skipping 27 matching lines @@
 
 void Buffer::CheckReleaseCallback() {
   if (attach_count_ || use_count_)
     return;
 
   // Run release callback to notify the client that buffer has been released.
   if (!release_callback_.is_null())
     release_callback_.Run();
 }
 
-void Buffer::ReleaseTexture(std::unique_ptr<Texture> texture) {
+void Buffer::ReleaseTexture(
+    std::unique_ptr<Texture> texture,
+    scoped_refptr<CompositorFrameSinkHolder> compositor_frame_sink_holder) {
   texture_ = std::move(texture);
 }
 
-void Buffer::ReleaseContentsTexture(std::unique_ptr<Texture> texture) {
+void Buffer::ReleaseContentsTexture(
+    std::unique_ptr<Texture> texture,
+    scoped_refptr<CompositorFrameSinkHolder> compositor_frame_sink_holder) {
   TRACE_EVENT0("exo", "Buffer::ReleaseContentsTexture");
 
   contents_texture_ = std::move(texture);
   Release();
 }
 
 }  // namespace exo