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

ui/gl/gl_image_io_surface.h

Index: ui/gl/gl_image_io_surface.h
diff --git a/ui/gl/gl_image_io_surface.h b/ui/gl/gl_image_io_surface.h
index 56b4478ec3be793f8f99db75024c753b3eaa0412..dd16677745a0f5dcb4a0e01e4cac5a926e385b9c 100644
--- a/ui/gl/gl_image_io_surface.h
+++ b/ui/gl/gl_image_io_surface.h
@@ -9,7 +9,8 @@
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/threading/thread_checker.h"
-#include "ui/gfx/gpu_memory_buffer.h"
+#include "ui/gfx/buffer_types.h"
+#include "ui/gfx/generic_shared_memory_id.h"
 #include "ui/gl/gl_image.h"
 
 #if defined(__OBJC__)
@@ -22,18 +23,19 @@ namespace gfx {
 
 class GL_EXPORT GLImageIOSurface : public GLImage {
  public:
-  GLImageIOSurface(const gfx::Size& size, unsigned internalformat);
+  GLImageIOSurface(const Size& size, unsigned internalformat);
 
   bool Initialize(IOSurfaceRef io_surface,
-                  gfx::GenericSharedMemoryId io_surface_id,
+                  GenericSharedMemoryId io_surface_id,
                   BufferFormat format);
 
   // Overridden from GLImage:
   void Destroy(bool have_context) override;
-  gfx::Size GetSize() override;
+  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 Point& offset,
                        const Rect& rect) override;
@@ -41,7 +43,7 @@ class GL_EXPORT GLImageIOSurface : public GLImage {
   void DidUseTexImage() override {}
   void WillModifyTexImage() override {}
   void DidModifyTexImage() override {}
-  bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
+  bool ScheduleOverlayPlane(AcceleratedWidget widget,
                             int z_order,
                             OverlayTransform transform,
                             const Rect& bounds_rect,
@@ -52,18 +54,17 @@ class GL_EXPORT GLImageIOSurface : public GLImage {
 
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface();
 
-  static void SetLayerForWidget(gfx::AcceleratedWidget widget,
-                                CALayer* layer);
+  static void SetLayerForWidget(AcceleratedWidget widget, CALayer* layer);
 
  protected:
   ~GLImageIOSurface() override;
 
  private:
-  const gfx::Size size_;
+  const Size size_;
   const unsigned internalformat_;
   BufferFormat format_;
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
-  gfx::GenericSharedMemoryId io_surface_id_;
+  GenericSharedMemoryId io_surface_id_;
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface);