cc: Make ResourceProvider use bindless Produce/ConsumeTextureCHROMIUM

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index a5fb1ce994580d9663d5b44ddf0d8f9fd499574e..51ae377c4b85fad39875e4ac24bf5008f98902a6 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1265,7 +1265,6 @@ class LayerTreeHostTestDelegatingRendererAtomicCommit
         // Verify that used texture is correct.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(0)));
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(1)));
-        context->ResetUsedTextures();

[sohanjg, 2014/11/05 12:46:43]

This reset needs to be avoided as used texture is inserted when bindTexture
happens, as we are avoiding the bind, we need to avoid this reset, otherwise in
DrawLayersOnThread we will have 0 used textures.

         break;
       case 1:
         // Number of textures should be doubled as the first context layer
@@ -1283,7 +1282,6 @@ class LayerTreeHostTestDelegatingRendererAtomicCommit
         // New textures should have been used.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(2)));
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(3)));
-        context->ResetUsedTextures();
         break;
       case 2:
         EndTest();
@@ -2468,8 +2466,8 @@ class MockIOSurfaceWebGraphicsContext3D : public TestWebGraphicsContext3D {
                                   GLenum type,
                                   GLintptr offset));
   MOCK_METHOD1(deleteTexture, void(GLenum texture));
-  MOCK_METHOD2(produceTextureCHROMIUM,
-               void(GLenum target, const GLbyte* mailbox));
+  MOCK_METHOD3(produceTextureDirectCHROMIUM,
+               void(GLuint texture, GLenum target, const GLbyte* mailbox));
 };
 
 class LayerTreeHostTestIOSurfaceDrawing : public LayerTreeHostTest {
@@ -2560,12 +2558,11 @@ class LayerTreeHostTestIOSurfaceDrawing : public LayerTreeHostTest {
               resource_provider->TargetForTesting(
                   io_surface_draw_quad->io_surface_resource_id));
 
-    EXPECT_CALL(*mock_context_, bindTexture(GL_TEXTURE_RECTANGLE_ARB, 1))
-        .Times(1);
     if (delegating_renderer()) {
       // The io surface layer's resource should be sent to the parent.
       EXPECT_CALL(*mock_context_,
-                  produceTextureCHROMIUM(GL_TEXTURE_RECTANGLE_ARB, _)).Times(1);
+                  produceTextureDirectCHROMIUM(_, GL_TEXTURE_RECTANGLE_ARB, _))
+          .Times(1);
     } else {
       // The io surface layer's texture is drawn.
       EXPECT_CALL(*mock_context_, activeTexture(GL_TEXTURE0)).Times(AtLeast(1));