commit 2b98b2a34b2b6f1816e8cb14dc5e2d145bc03cdc
author bajones <bajones@chromium.org> Tue Sep 15 02:27:36 2015
committer Commit bot <commit-bot@chromium.org> Tue Sep 15 02:28:10 2015
tree ab05f23315935dc0d53a1e3d27d355a22d909e1d
parent 8e1a39ad4a19c4519e3cb0450e81d2d273a667fe

Fixed issue with compositor texture bindings leaking through to WebGL contexts.

BUG=524144

Review URL: https://codereview.chromium.org/1337613002

Cr-Commit-Position: refs/heads/master@{#348822}

gpu/command_buffer/service/context_state.h

diff --git a/gpu/command_buffer/service/context_state.h b/gpu/command_buffer/service/context_state.h
index f07c83cd..f9d4ff7 100644
--- a/gpu/command_buffer/service/context_state.h
+++ b/gpu/command_buffer/service/context_state.h
@@ -81,24 +81,6 @@
     NOTREACHED();
     return NULL;
   }
-
-  void Unbind(TextureRef* texture) {
-    if (bound_texture_2d.get() == texture) {
-      bound_texture_2d = NULL;
-    }
-    if (bound_texture_cube_map.get() == texture) {
-      bound_texture_cube_map = NULL;
-    }
-    if (bound_texture_external_oes.get() == texture) {
-      bound_texture_external_oes = NULL;
-    }
-    if (bound_texture_3d.get() == texture) {
-      bound_texture_3d = NULL;
-    }
-    if (bound_texture_2d_array.get() == texture) {
-      bound_texture_2d_array = NULL;
-    }
-  }
 };
 
 class GPU_EXPORT Vec4 {
@@ -234,6 +216,8 @@
   void SetBoundBuffer(GLenum target, Buffer* buffer);
   void RemoveBoundBuffer(Buffer* buffer);
 
+  void UnbindTexture(TextureRef* texture);
+
   #include "gpu/command_buffer/service/context_state_autogen.h"
 
   EnableFlags enable_flags;