Make DrawingBuffer and Canvas2DLayerBridge be cc::TextureLayerClients.

cc/blink/web_external_texture_layer_impl.h

Index: cc/blink/web_external_texture_layer_impl.h
diff --git a/cc/blink/web_external_texture_layer_impl.h b/cc/blink/web_external_texture_layer_impl.h
index cce8170080f3e410d690c98d2c8264537050ac56..1df62cf6243ba6501691a15e9c737a5f2087ad5f 100644
--- a/cc/blink/web_external_texture_layer_impl.h
+++ b/cc/blink/web_external_texture_layer_impl.h
@@ -6,37 +6,21 @@
 #define CC_BLINK_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
 
 #include <memory>
-#include <vector>
 
-#include "base/bind.h"
 #include "base/macros.h"
 #include "cc/blink/cc_blink_export.h"
-#include "cc/layers/texture_layer_client.h"
 #include "third_party/WebKit/public/platform/WebExternalTextureLayer.h"
 
-namespace blink {
-class WebExternalTextureLayerClient;
-struct WebFloatRect;
-struct WebExternalTextureMailbox;
-}
-
 namespace cc {
-class SingleReleaseCallback;
-class TextureMailbox;
+class TextureLayerClient;
 }
 
 namespace cc_blink {
-
 class WebLayerImpl;
-class WebExternalBitmapImpl;
 
-class WebExternalTextureLayerImpl
-    : public blink::WebExternalTextureLayer,
-      public cc::TextureLayerClient,
-      public base::SupportsWeakPtr<WebExternalTextureLayerImpl> {
+class WebExternalTextureLayerImpl : public blink::WebExternalTextureLayer {
  public:
-  CC_BLINK_EXPORT explicit WebExternalTextureLayerImpl(
-      blink::WebExternalTextureLayerClient*);
+  CC_BLINK_EXPORT explicit WebExternalTextureLayerImpl(cc::TextureLayerClient*);
   ~WebExternalTextureLayerImpl() override;
 
   // blink::WebExternalTextureLayer implementation.
@@ -47,25 +31,8 @@ class WebExternalTextureLayerImpl
   void setBlendBackgroundColor(bool blend) override;
   void setNearestNeighbor(bool nearest_neighbor) override;
 
-  // TextureLayerClient implementation.
-  bool PrepareTextureMailbox(
-      cc::TextureMailbox* mailbox,
-      std::unique_ptr<cc::SingleReleaseCallback>* release_callback,
-      bool use_shared_memory) override;
-
  private:
-  static void DidReleaseMailbox(
-      base::WeakPtr<WebExternalTextureLayerImpl> layer,
-      const blink::WebExternalTextureMailbox& mailbox,
-      WebExternalBitmapImpl* bitmap,
-      const gpu::SyncToken& sync_token,
-      bool lost_resource);
-
-  WebExternalBitmapImpl* AllocateBitmap();
-
-  blink::WebExternalTextureLayerClient* client_;
   std::unique_ptr<WebLayerImpl> layer_;
-  std::vector<std::unique_ptr<WebExternalBitmapImpl>> free_bitmaps_;
 
   DISALLOW_COPY_AND_ASSIGN(WebExternalTextureLayerImpl);
 };