1 files changed, 24 insertions, 13 deletions

diff --git a/gpu/command_buffer/service/texture_definition.cc b/gpu/command_buffer/service/texture_definition.cc
index 38fd956..1f1372a 100644
--- a/gpu/command_buffer/service/texture_definition.cc
+++ b/gpu/command_buffer/service/texture_definition.cc
@@ -36,10 +36,13 @@ 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,
@@ -91,18 +94,24 @@ void GLImageSync::ReleaseTexImage(unsigned target) {
   NOTREACHED();
 }
 
-bool GLImageSync::CopyTexImage(unsigned target) {
-  NOTREACHED();
-  return false;
-}
-
 bool GLImageSync::CopyTexSubImage(unsigned target,
                                   const gfx::Point& offset,
                                   const gfx::Rect& rect) {
-  NOTREACHED();
   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,
@@ -348,7 +357,7 @@ TextureDefinition::TextureDefinition(
         new GLImageSync(image_buffer_,
                         gfx::Size(first_face.level_infos[0].width,
                                   first_face.level_infos[0].height)));
-    texture->SetLevelImage(target_, 0, gl_image.get(), Texture::BOUND);
+    texture->SetLevelImage(NULL, target_, 0, gl_image.get());
   }
 
   const Texture::LevelInfo& level = first_face.level_infos[0];
@@ -397,10 +406,12 @@ void TextureDefinition::UpdateTextureInternal(Texture* texture) const {
 
   if (image_buffer_.get()) {
     texture->SetLevelImage(
-        target_, 0,
-        new GLImageSync(image_buffer_,
-                        gfx::Size(level_info_.width, level_info_.height)),
-        Texture::BOUND);
+        NULL,
+        target_,
+        0,
+        new GLImageSync(
+            image_buffer_,
+            gfx::Size(level_info_.width, level_info_.height)));
   }
 
   texture->target_ = target_;
@@ -426,7 +437,7 @@ void TextureDefinition::UpdateTexture(Texture* texture) const {
     if (bound_id == static_cast<GLint>(old_service_id)) {
       glBindTexture(target_, service_id);
     }
-    texture->SetLevelImage(target_, 0, NULL, Texture::UNBOUND);
+    texture->SetLevelImage(NULL, target_, 0, NULL);
   }
 
   UpdateTextureInternal(texture);