cc: Remove TextureLayer::SetTextureId and TextureLayer::WillModifyTexture

cc/layers/texture_layer.h

Index: cc/layers/texture_layer.h
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
index 009a217ae6a97cf6818d92912c8a498d9917ccbf..6ed4c544b14741a544a1f4d40790969ab78ba3b0 100644
--- a/cc/layers/texture_layer.h
+++ b/cc/layers/texture_layer.h
@@ -90,8 +90,16 @@ class CC_EXPORT TextureLayer : public Layer {
   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.

[danakj, 2014/04/01 15:03:37]

This isn't quite true is it? You need to wait for the ReleaseCallback still or
you risk killing the texture just before it's drawn. e.g. it could be in flight
to the browser.

[piman, 2014/04/01 20:21:11]

Yeah, we've stopped doing the AcquireLayerTextures for mailboxes a while ago.
Updated comments here and below.

   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.

[danakj, 2014/04/01 15:03:37]

This isn't quite true is it? You need to wait for the ReleaseCallback still or
you risk killing the texture just before it's drawn.

[piman, 2014/04/01 20:21:11]

Done.

+  void ClearTexture();
+
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
       OVERRIDE;
 
@@ -122,10 +130,6 @@ class CC_EXPORT TextureLayer : public Layer {
   // 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,
@@ -137,8 +141,6 @@ class CC_EXPORT TextureLayer : public Layer {
   // TODO(danakj): Remove this when pepper doesn't need it. crbug.com/350204
   void SetTextureMailboxWithoutReleaseCallback(const TextureMailbox& mailbox);
 
-  void WillModifyTexture();
-
   virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) OVERRIDE;
 
   virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) OVERRIDE;
@@ -170,7 +172,7 @@ class CC_EXPORT TextureLayer : public Layer {
   bool premultiplied_alpha_;
   bool blend_background_color_;
   bool rate_limit_context_;
-  bool content_committed_;
+  bool impl_may_draw_client_data_;
 
   unsigned texture_id_;
   scoped_ptr<TextureMailboxHolder::MainThreadReference> holder_ref_;