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

gpu/command_buffer/service/texture_definition.cc

Index: gpu/command_buffer/service/texture_definition.cc
diff --git a/gpu/command_buffer/service/texture_definition.cc b/gpu/command_buffer/service/texture_definition.cc
index 1f1372a711be8fb85ae9044508c5aa5e96915238..ad9fe8a9a105bc17d20492acfa2756310a933a3f 100644
--- a/gpu/command_buffer/service/texture_definition.cc
+++ b/gpu/command_buffer/service/texture_definition.cc
@@ -36,13 +36,10 @@ class GLImageSync : 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 WillModifyTexImage() override;
-  void DidModifyTexImage() override;
-  void DidUseTexImage() override;
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int z_order,
                             gfx::OverlayTransform transform,
@@ -94,24 +91,16 @@ void GLImageSync::ReleaseTexImage(unsigned target) {
   NOTREACHED();
 }
 
+bool GLImageSync::CopyTexImage(unsigned target) {
+  return false;

[no sievers, 2015/10/15 21:52:44]

NOTREACHED() also?

[reveman, 2015/10/15 22:56:16]

Done. Here and below.

+}
+
 bool GLImageSync::CopyTexSubImage(unsigned target,
                                   const gfx::Point& offset,
                                   const gfx::Rect& rect) {
   return false;
 }
 
-void GLImageSync::WillUseTexImage() {
-}
-
-void GLImageSync::DidUseTexImage() {
-}
-
-void GLImageSync::WillModifyTexImage() {
-}
-
-void GLImageSync::DidModifyTexImage() {
-}
-
 bool GLImageSync::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                                        int z_order,
                                        gfx::OverlayTransform transform,
@@ -357,7 +346,7 @@ TextureDefinition::TextureDefinition(
         new GLImageSync(image_buffer_,
                         gfx::Size(first_face.level_infos[0].width,
                                   first_face.level_infos[0].height)));
-    texture->SetLevelImage(NULL, target_, 0, gl_image.get());
+    texture->SetLevelImage(target_, 0, gl_image.get(), Texture::BOUND);
   }
 
   const Texture::LevelInfo& level = first_face.level_infos[0];
@@ -406,12 +395,10 @@ void TextureDefinition::UpdateTextureInternal(Texture* texture) const {
 
   if (image_buffer_.get()) {
     texture->SetLevelImage(
-        NULL,
-        target_,
-        0,
-        new GLImageSync(
-            image_buffer_,
-            gfx::Size(level_info_.width, level_info_.height)));
+        target_, 0,
+        new GLImageSync(image_buffer_,
+                        gfx::Size(level_info_.width, level_info_.height)),
+        Texture::BOUND);
   }
 
   texture->target_ = target_;
@@ -437,7 +424,7 @@ void TextureDefinition::UpdateTexture(Texture* texture) const {
     if (bound_id == static_cast<GLint>(old_service_id)) {
       glBindTexture(target_, service_id);
     }
-    texture->SetLevelImage(NULL, target_, 0, NULL);
+    texture->SetLevelImage(target_, 0, NULL, Texture::UNBOUND);
   }
 
   UpdateTextureInternal(texture);