gpu: Add CHROMIUM_texture_from_image spec and fence support.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
index cffb15c924815cecf2cceb837b7eac0b08a6d20e..01e8464ad5f2dc1055aa23bc8d1912f38735cb9e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
@@ -3601,7 +3601,7 @@ TEST_P(GLES2DecoderTest, BindTexImage2DCHROMIUM) {
 
   // Bind image to texture.
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
   EXPECT_TRUE(
       texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr));
   // Image should now be set.
@@ -3622,7 +3622,7 @@ TEST_P(GLES2DecoderTest, BindTexImage2DCHROMIUMCubeMapNotAllowed) {
   DoBindTexture(GL_TEXTURE_CUBE_MAP, client_texture_id_, kServiceTextureId);
 
   BindTexImage2DCHROMIUM bind_tex_image_2d_cmd;
-  bind_tex_image_2d_cmd.Init(GL_TEXTURE_CUBE_MAP, 1);
+  bind_tex_image_2d_cmd.Init(GL_TEXTURE_CUBE_MAP, 1, 0);
   EXPECT_EQ(error::kNoError, ExecuteCmd(bind_tex_image_2d_cmd));
   EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
 }
@@ -3632,7 +3632,7 @@ TEST_P(GLES2DecoderTest, OrphanGLImageWithTexImage2D) {
   GetImageManager()->AddImage(image.get(), 1);
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
 
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
 
   TextureRef* texture_ref =
       group().texture_manager()->GetTexture(client_texture_id_);
@@ -3673,7 +3673,7 @@ TEST_P(GLES2DecoderTest, GLImageAttachedAfterSubTexImage2D) {
                pixels_shm_id, pixels_shm_offset);
 
   // Bind texture to GLImage.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
 
   // Check binding.
   TextureRef* texture_ref =
@@ -3717,7 +3717,7 @@ TEST_P(GLES2DecoderTest, GLImageAttachedAfterClearLevel) {
                pixels_shm_id, pixels_shm_offset);
 
   // Bind texture to GLImage.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
 
   // Check binding.
   TextureRef* texture_ref =
@@ -3769,7 +3769,7 @@ TEST_P(GLES2DecoderTest, ReleaseTexImage2DCHROMIUM) {
 
   // Bind image to texture.
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, 1, 0);
   EXPECT_TRUE(
       texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr));
   // Image should now be set.
@@ -3797,7 +3797,7 @@ class MockGLImage : public gl::GLImage {
   // Overridden from gl::GLImage:
   MOCK_METHOD0(GetSize, gfx::Size());
   MOCK_METHOD0(GetInternalFormat, unsigned());
-  MOCK_METHOD1(BindTexImage, bool(unsigned));
+  MOCK_METHOD2(BindTexImage, bool(unsigned, gl::GLFence*));
   MOCK_METHOD1(ReleaseTexImage, void(unsigned));
   MOCK_METHOD1(CopyTexImage, bool(unsigned));
   MOCK_METHOD3(CopyTexSubImage,
@@ -3841,7 +3841,7 @@ TEST_P(GLES2DecoderWithShaderTest, CopyTexImage) {
   GetImageManager()->AddImage(image.get(), kImageId);
 
   // Bind image to texture.
-  EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D))
+  EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D, nullptr))
       .Times(1)
       .WillOnce(Return(false))
       .RetiresOnSaturation();
@@ -3854,7 +3854,7 @@ TEST_P(GLES2DecoderWithShaderTest, CopyTexImage) {
       .WillOnce(Return(GL_RGBA))
       .RetiresOnSaturation();
   // ScopedGLErrorSuppressor calls GetError on its constructor and destructor.
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId, 0);
 
   AddExpectationsForSimulatedAttrib0(kNumVertices, 0);
   SetupExpectationsForApplyingDefaultDirtyState();
@@ -3882,7 +3882,7 @@ TEST_P(GLES2DecoderWithShaderTest, CopyTexImage) {
   ReleaseTexImage2DCHROMIUM release_tex_image_2d_cmd;
   release_tex_image_2d_cmd.Init(GL_TEXTURE_2D, kImageId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(release_tex_image_2d_cmd));
-  EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D))
+  EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D, nullptr))
       .Times(1)
       .WillOnce(Return(false))
       .RetiresOnSaturation();
@@ -3894,7 +3894,7 @@ TEST_P(GLES2DecoderWithShaderTest, CopyTexImage) {
       .Times(1)
       .WillOnce(Return(GL_RGBA))
       .RetiresOnSaturation();
-  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId);
+  DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId, 0);
 
   DoBindFramebuffer(
       GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
@@ -4586,7 +4586,7 @@ TEST_P(GLES2DecoderWithShaderTest, CHROMIUMImageEmulatingRGB) {
       EXPECT_FALSE(GetImageManager()->LookupImage(image_id) == NULL);
       DoBindTexture(GL_TEXTURE_2D, kFBOClientTextureId, kFBOServiceTextureId);
 
-      DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id);
+      DoBindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id, 0);
       DoFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target,
                              kFBOClientTextureId, kFBOServiceTextureId, level,
                              GL_NO_ERROR);