Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.

content/common/gpu/stream_texture_android.h

Index: content/common/gpu/stream_texture_android.h
diff --git a/content/common/gpu/stream_texture_android.h b/content/common/gpu/stream_texture_android.h
index cce4502c2723f9466955477133316f41238649c6..9f0341f7ddacb8015dfabf408915fa783203a61a 100644
--- a/content/common/gpu/stream_texture_android.h
+++ b/content/common/gpu/stream_texture_android.h
@@ -29,6 +29,7 @@ class StreamTexture : public gfx::GLImage,
  private:
   StreamTexture(GpuCommandBufferStub* owner_stub,
                 int32 route_id,
+                uint32 client_texture_id,
                 uint32 texture_id);
   ~StreamTexture() override;
 
@@ -38,13 +39,10 @@ class StreamTexture : public gfx::GLImage,
   unsigned GetInternalFormat() override;
   bool BindTexImage(unsigned target) override;
   void ReleaseTexImage(unsigned target) override;
+  bool CopyTexImage(unsigned target) override;
   bool CopyTexSubImage(unsigned target,
                        const gfx::Point& offset,
                        const gfx::Rect& rect) override;
-  void WillUseTexImage() override;
-  void DidUseTexImage() override {}
-  void WillModifyTexImage() override {}
-  void DidModifyTexImage() override {}
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int z_order,
                             gfx::OverlayTransform transform,
@@ -85,6 +83,7 @@ class StreamTexture : public gfx::GLImage,
   GpuCommandBufferStub* owner_stub_;
   int32 route_id_;
   bool has_listener_;
+  uint32 client_texture_id_;
 
   base::WeakPtrFactory<StreamTexture> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(StreamTexture);