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

content/common/gpu/stream_texture_android.h

 // Copyright (c) 2013 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 CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
 #define CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
@@ skipping 11 matching lines @@
                       public IPC::Listener,
                       public GpuCommandBufferStub::DestructionObserver {
  public:
   static bool Create(GpuCommandBufferStub* owner_stub,
                      uint32 client_texture_id,
                      int stream_id);
 
  private:
   StreamTexture(GpuCommandBufferStub* owner_stub,
                 int32 route_id,
+                uint32 client_texture_id,
                 uint32 texture_id);
   ~StreamTexture() override;
 
   // gfx::GLImage implementation:
   void Destroy(bool have_context) override;
   gfx::Size GetSize() override;
   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,
                             const gfx::Rect& bounds_rect,
                             const gfx::RectF& crop_rect) override;
   void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
                     uint64_t process_tracing_id,
                     const std::string& dump_name) override;
 
   // GpuCommandBufferStub::DestructionObserver implementation.
@@ skipping 20 matching lines @@
 
   // Whether we ever bound a valid frame.
   bool has_valid_frame_;
 
   // Whether a new frame is available that we should update to.
   bool has_pending_frame_;
 
   GpuCommandBufferStub* owner_stub_;
   int32 route_id_;
   bool has_listener_;
+  uint32 client_texture_id_;
 
   base::WeakPtrFactory<StreamTexture> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(StreamTexture);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_