Add gpu::MailboxHolder to hold state for a gpu::Mailbox

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/texture_mailbox.h"
 
 namespace cc {
 class BlockingTaskRunner;
 class SingleReleaseCallback;
 class TextureLayerClient;
 
 // A Layer containing a the rendered output of a plugin instance.
 class CC_EXPORT TextureLayer : public Layer {
  public:
-  class CC_EXPORT MailboxHolder
-      : public base::RefCountedThreadSafe<MailboxHolder> {
+  class CC_EXPORT TextureMailboxHolder
+      : public base::RefCountedThreadSafe<TextureMailboxHolder> {
    public:
     class CC_EXPORT MainThreadReference {
      public:
-      explicit MainThreadReference(MailboxHolder* holder);
+      explicit MainThreadReference(TextureMailboxHolder* holder);
       ~MainThreadReference();
-      MailboxHolder* holder() { return holder_.get(); }
+      TextureMailboxHolder* holder() { return holder_.get(); }
 
      private:
-      scoped_refptr<MailboxHolder> holder_;
+      scoped_refptr<TextureMailboxHolder> holder_;
       DISALLOW_COPY_AND_ASSIGN(MainThreadReference);
     };
 
     const TextureMailbox& mailbox() const { return mailbox_; }
-    void Return(unsigned sync_point, bool is_lost);
+    void Return(uint32 sync_point, bool is_lost);
 
     // Gets a ReleaseCallback that can be called from another thread. Note: the
     // caller must ensure the callback is called.
     scoped_ptr<SingleReleaseCallback> GetCallbackForImplThread();
 
    protected:
     friend class TextureLayer;
 
     // Protected visiblity so only TextureLayer and unit tests can create these.
     static scoped_ptr<MainThreadReference> Create(
         const TextureMailbox& mailbox,
         scoped_ptr<SingleReleaseCallback> release_callback);
-    virtual ~MailboxHolder();
+    virtual ~TextureMailboxHolder();
 
    private:
-    friend class base::RefCountedThreadSafe<MailboxHolder>;
+    friend class base::RefCountedThreadSafe<TextureMailboxHolder>;
     friend class MainThreadReference;
-    explicit MailboxHolder(const TextureMailbox& mailbox,
-                           scoped_ptr<SingleReleaseCallback> release_callback);
+    explicit TextureMailboxHolder(
+        const TextureMailbox& mailbox,
+        scoped_ptr<SingleReleaseCallback> release_callback);
 
     void InternalAddRef();
     void InternalRelease();
-    void ReturnAndReleaseOnImplThread(unsigned sync_point, bool is_lost);
+    void ReturnAndReleaseOnImplThread(uint32 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_;
     scoped_ptr<SingleReleaseCallback> 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_;
+    uint32 sync_point_;
     bool is_lost_;
-    DISALLOW_COPY_AND_ASSIGN(MailboxHolder);
+    DISALLOW_COPY_AND_ASSIGN(TextureMailboxHolder);
   };
 
   // If this texture layer requires special preparation logic for each frame
   // driven by the compositor, pass in a non-nil client. Pass in a nil client
   // pointer if texture updates are driven by an external process.
   static scoped_refptr<TextureLayer> Create(TextureLayerClient* client);
 
   // Used when mailbox names are specified instead of texture IDs.
   static scoped_refptr<TextureLayer> CreateForMailbox(
       TextureLayerClient* client);
@@ skipping 67 matching lines @@
   gfx::PointF uv_top_left_;
   gfx::PointF uv_bottom_right_;
   // [bottom left, top left, top right, bottom right]
   float vertex_opacity_[4];
   bool premultiplied_alpha_;
   bool blend_background_color_;
   bool rate_limit_context_;
   bool content_committed_;
 
   unsigned texture_id_;
-  scoped_ptr<MailboxHolder::MainThreadReference> holder_ref_;
+  scoped_ptr<TextureMailboxHolder::MainThreadReference> holder_ref_;
   bool needs_set_mailbox_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureLayer);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_TEXTURE_LAYER_H_