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

ui/gl/gl_image_surface_texture.cc

 // Copyright 2014 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.
 
 #include "ui/gl/gl_image_surface_texture.h"
 
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/android/surface_texture.h"
 
 namespace gfx {
 
-GLImageSurfaceTexture::GLImageSurfaceTexture(const gfx::Size& size)
-    : size_(size), texture_id_(0) {
-}
+GLImageSurfaceTexture::GLImageSurfaceTexture(const Size& size)
+    : size_(size), texture_id_(0) {}
 
 GLImageSurfaceTexture::~GLImageSurfaceTexture() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!surface_texture_.get());
   DCHECK_EQ(0, texture_id_);
 }
 
 bool GLImageSurfaceTexture::Initialize(SurfaceTexture* surface_texture) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!surface_texture_.get());
   surface_texture_ = surface_texture;
   return true;
 }
 
 void GLImageSurfaceTexture::Destroy(bool have_context) {
   DCHECK(thread_checker_.CalledOnValidThread());
   surface_texture_ = NULL;
   texture_id_ = 0;
 }
 
-gfx::Size GLImageSurfaceTexture::GetSize() { return size_; }
+Size GLImageSurfaceTexture::GetSize() {
+  return size_;
+}
 
 unsigned GLImageSurfaceTexture::GetInternalFormat() { return GL_RGBA; }
 
 bool GLImageSurfaceTexture::BindTexImage(unsigned target) {
   TRACE_EVENT0("gpu", "GLImageSurfaceTexture::BindTexImage");
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (target != GL_TEXTURE_EXTERNAL_OES) {
     LOG(ERROR)
         << "Surface texture can only be bound to TEXTURE_EXTERNAL_OES target";
@@ skipping 25 matching lines @@
     // This will attach the surface texture to the texture currently bound to
     // GL_TEXTURE_EXTERNAL_OES target.
     surface_texture_->AttachToGLContext();
     texture_id_ = texture_id;
   }
 
   surface_texture_->UpdateTexImage();
   return true;
 }
 
+bool GLImageSurfaceTexture::CopyTexImage(unsigned target) {
+  return false;
+}
+
 bool GLImageSurfaceTexture::CopyTexSubImage(unsigned target,
                                             const Point& offset,
                                             const Rect& rect) {
   return false;
 }
 
-bool GLImageSurfaceTexture::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
+bool GLImageSurfaceTexture::ScheduleOverlayPlane(AcceleratedWidget widget,
                                                  int z_order,
                                                  OverlayTransform transform,
                                                  const Rect& bounds_rect,
                                                  const RectF& crop_rect) {
   return false;
 }
 
 void GLImageSurfaceTexture::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd,
     uint64_t process_tracing_id,
     const std::string& dump_name) {
   // TODO(ericrk): Add OnMemoryDump for GLImages. crbug.com/514914
 }
 
 }  // namespace gfx