Revert 212008 "cc: Remove TextureLayer::SetTextureId and Texture..."

trunk/src/cc/layers/texture_layer.h

Index: trunk/src/cc/layers/texture_layer.h
===================================================================
--- trunk/src/cc/layers/texture_layer.h	(revision 212317)
+++ trunk/src/cc/layers/texture_layer.h	(working copy)
@@ -34,16 +34,8 @@
   static scoped_refptr<TextureLayer> CreateForMailbox(
       TextureLayerClient* client);
 
-  // Resets the client, which also resets the texture. This may synchronize with
-  // the impl thread if it is currently drawing a texture or a mailbox from the
-  // client. After this call it is safe to destroy the texture / mailbox.
   void ClearClient();
 
-  // Resets the texture. This may synchronize with the impl thread if it is
-  // currently drawing a texture or a mailbox from the client. After this call
-  // it is safe to destroy the texture / mailbox.
-  void ClearTexture();
-
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
       OVERRIDE;
 
@@ -74,10 +66,15 @@
   // Requires a non-nil client.  Defaults to false.
   void SetRateLimitContext(bool rate_limit);
 
+  // Code path for plugins which supply their own texture ID.
+  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 WillModifyTexture();
+
   virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) OVERRIDE;
 
   virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) OVERRIDE;
@@ -138,10 +135,6 @@
     DISALLOW_COPY_AND_ASSIGN(MailboxHolder);
   };
 
-  // Returns true if we draw content coming from the client, which implies we
-  // may need to synchronize with the impl thread when the client goes away.
-  bool DrawsClientData() const;
-
   TextureLayerClient* client_;
   bool uses_mailbox_;
 
@@ -153,7 +146,7 @@
   bool premultiplied_alpha_;
   bool blend_background_color_;
   bool rate_limit_context_;
-  bool impl_may_draw_client_data_;
+  bool content_committed_;
 
   unsigned texture_id_;
   scoped_ptr<MailboxHolder::MainThreadReference> holder_ref_;