Re-land "cc: Remove TextureLayer::SetTextureId and TextureLayer::WillModifyTexture"

trunk/src/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"
@@ skipping 72 matching lines @@
 
   // 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);
 
+  // Resets the client, which also resets the texture. This may synchronize with
+  // the impl thread if it is currently drawing a texture from the client, that
+  // was given via TextureLayerClient::PrepareTexture. After this call it is
+  // safe to destroy that texture. Note: it doesn't synchronize for mailboxes,
+  // those can only be destroyed after the release callback has been called.
   void ClearClient();
 
+  // Resets the texture. This may synchronize with the impl thread if it is
+  // currently drawing a texture from the client, that was given via
+  // TextureLayerClient::PrepareTexture. After this call it is safe to destroy
+  // that texture. Note: it doesn't synchronize for mailboxes, those can only be
+  // destroyed after the release callback has been called.
+  void ClearTexture();
+
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
       OVERRIDE;
 
   // Sets whether this texture should be Y-flipped at draw time. Defaults to
   // true.
   void SetFlipped(bool flipped);
 
   // Sets a UV transform to be used at draw time. Defaults to (0, 0) and (1, 1).
   void SetUV(const gfx::PointF& top_left, const gfx::PointF& bottom_right);
 
@@ skipping 10 matching lines @@
 
   // Sets whether the texture should be blended with the background color
   // at draw time. Defaults to false.
   void SetBlendBackgroundColor(bool blend);
 
   // Sets whether this context should rate limit on damage to prevent too many
   // 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,
                          scoped_ptr<SingleReleaseCallback> release_callback);
 
   // Use this for special cases where the same texture is used to back the
   // TextureLayer across all frames.
   // WARNING: DON'T ACTUALLY USE THIS WHAT YOU ARE DOING IS WRONG.
   // 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;
   virtual bool DrawsContent() const OVERRIDE;
   virtual bool Update(ResourceUpdateQueue* queue,
                       const OcclusionTracker<Layer>* occlusion) OVERRIDE;
   virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
   virtual Region VisibleContentOpaqueRegion() const OVERRIDE;
 
  protected:
@@ skipping 11 matching lines @@
   bool uses_mailbox_;
 
   bool flipped_;
   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_;
+  bool impl_may_draw_client_data_;
 
   unsigned texture_id_;
   scoped_ptr<TextureMailboxHolder::MainThreadReference> holder_ref_;
   bool needs_set_mailbox_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureLayer);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_TEXTURE_LAYER_H_