cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

cc/layers/texture_layer.h

 // Copyright 2010 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.
 
 #ifndef CC_LAYERS_TEXTURE_LAYER_H_
 #define CC_LAYERS_TEXTURE_LAYER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/synchronization/lock.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
+#include "cc/resources/scoped_release_callback.h"

[piman, 2013/09/12 01:13:03]

File is missing from the CL :(

[danakj, 2013/09/12 01:20:16]

Ooops oops, fixed!

 #include "cc/resources/texture_mailbox.h"
 
 namespace WebKit { class WebGraphicsContext3D; }
 
 namespace cc {
 class BlockingTaskRunner;
 class TextureLayerClient;
 
 // A Layer containing a the rendered output of a plugin instance.
 class CC_EXPORT TextureLayer : public Layer {
@@ skipping 10 matching lines @@
      private:
       scoped_refptr<MailboxHolder> holder_;
       DISALLOW_COPY_AND_ASSIGN(MainThreadReference);
     };
 
     const TextureMailbox& mailbox() const { return mailbox_; }
     void Return(unsigned sync_point, bool is_lost);
 
     // Gets a ReleaseCallback that can be called from another thread. Note: the
     // caller must ensure the callback is called.
-    TextureMailbox::ReleaseCallback GetCallbackForImplThread();
+    ScopedReleaseCallback GetCallbackForImplThread();
 
    protected:
     friend class TextureLayer;
 
     // Protected visiblity so only TextureLayer and unit tests can create these.
     static scoped_ptr<MainThreadReference> Create(
-        const TextureMailbox& mailbox);
+        const TextureMailbox& mailbox,
+        ScopedReleaseCallback release_callback);
     virtual ~MailboxHolder();
 
    private:
     friend class base::RefCountedThreadSafe<MailboxHolder>;
     friend class MainThreadReference;
-    explicit MailboxHolder(const TextureMailbox& mailbox);
+    explicit MailboxHolder(const TextureMailbox& mailbox,
+                           ScopedReleaseCallback release_callback);
 
     void InternalAddRef();
     void InternalRelease();
     void ReturnAndReleaseOnImplThread(unsigned sync_point, bool is_lost);
 
     // This member is thread safe, and is accessed on main and impl threads.
     const scoped_refptr<BlockingTaskRunner> message_loop_;
 
     // These members are only accessed on the main thread, or on the impl thread
     // during commit where the main thread is blocked.
     unsigned internal_references_;
     TextureMailbox mailbox_;
+    ScopedReleaseCallback release_callback_;
 
     // This lock guards the sync_point_ and is_lost_ fields because they can be
     // accessed on both the impl and main thread. We do this to ensure that the
     // values of these fields are well-ordered such that the last call to
     // ReturnAndReleaseOnImplThread() defines their values.
     base::Lock arguments_lock_;
     unsigned sync_point_;
     bool is_lost_;
     DISALLOW_COPY_AND_ASSIGN(MailboxHolder);
   };
@@ skipping 38 matching lines @@
   // frames from being queued up before the compositor gets a chance to run.
   // Requires a non-nil client.  Defaults to false.
   void SetRateLimitContext(bool rate_limit);
 
   // Code path for plugins which supply their own texture ID.
   // DEPRECATED. DO NOT USE.
   void SetTextureId(unsigned texture_id);
 
   // Code path for plugins which supply their own mailbox.
   bool uses_mailbox() const { return uses_mailbox_; }
-  void SetTextureMailbox(const TextureMailbox& mailbox);
+  void SetTextureMailbox(const TextureMailbox& mailbox,
+                         ScopedReleaseCallback release_callback);
 
   void WillModifyTexture();
 
   virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) OVERRIDE;
 
   virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) OVERRIDE;
   virtual bool DrawsContent() const OVERRIDE;
   virtual bool Update(ResourceUpdateQueue* queue,
                       const OcclusionTracker* occlusion) OVERRIDE;
   virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
@@ skipping 21 matching lines @@
 
   unsigned texture_id_;
   scoped_ptr<MailboxHolder::MainThreadReference> holder_ref_;
   bool needs_set_mailbox_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureLayer);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_TEXTURE_LAYER_H_