Removed vestigial GL_latch_CHROMIUM code.

glFlush now has barrier semantics and is now used as an alternative.

This patch is dependent on https://bugs.webkit.org/show_bug.cgi?id=65043, now landed as webkit r91736.
Review URL: http://codereview.chromium.org/7495009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94215 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 2 insertions, 12 deletions

diff --git a/gpu/command_buffer/common/constants.h b/gpu/command_buffer/common/constants.h
index 1b14636..38a8c32 100644
--- a/gpu/command_buffer/common/constants.h
+++ b/gpu/command_buffer/common/constants.h
@@ -49,12 +49,6 @@ const int32 kInvalidSharedMemoryId = -1;
 // Common Command Buffer shared memory transfer buffer ID.
 const int32 kCommandBufferSharedMemoryId = 4;
 
-// Common Latch shared memory transfer buffer ID.
-const int32 kLatchSharedMemoryId = 5;
-
-// Invalid latch ID.
-const uint32 kInvalidLatchId = 0xffffffffu;
-
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_CONSTANTS_H_
diff --git a/gpu/command_buffer/service/common_decoder_unittest.cc b/gpu/command_buffer/service/common_decoder_unittest.cc
index 8f88398..a240948 100644
--- a/gpu/command_buffer/service/common_decoder_unittest.cc
+++ b/gpu/command_buffer/service/common_decoder_unittest.cc
@@ -131,8 +131,7 @@ class MockCommandBufferEngine : public CommandBufferEngine {
 
  private:
   bool IsValidSharedMemoryId(int32 shm_id) {
-    return shm_id == kValidShmId || shm_id == kStartValidShmId ||
-        shm_id == gpu::kLatchSharedMemoryId;
+    return shm_id == kValidShmId || shm_id == kStartValidShmId;
   }
 
   int8 buffer_[kBufferSize];
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
index bbc06cb..21e4550 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -106,7 +106,6 @@ void FeatureInfo::AddFeatures(const char* desired_features) {
   AddExtensionString("GL_CHROMIUM_resource_safe");
   AddExtensionString("GL_CHROMIUM_resize");
   AddExtensionString("GL_CHROMIUM_strict_attribs");
-  AddExtensionString("GL_CHROMIUM_latch");
   AddExtensionString("GL_CHROMIUM_swapbuffers_complete_callback");
   AddExtensionString("GL_CHROMIUM_rate_limit_offscreen_context");
 
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
index 2f1275c..13e60bb 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
@@ -48,7 +48,6 @@ class MockGLES2Decoder : public GLES2Decoder {
   MOCK_METHOD0(GetContextGroup, ContextGroup*());
   MOCK_METHOD1(SetResizeCallback, void(Callback1<gfx::Size>::Type*));
   MOCK_METHOD1(SetSwapBuffersCallback, void(Callback0::Type*));
-  MOCK_METHOD1(SetLatchCallback, void(const base::Callback<void(bool)>&));
   MOCK_METHOD3(DoCommand, error::Error(unsigned int command,
                                        unsigned int arg_count,
                                        const void* cmd_data));
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index 10d3037..3762952 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -307,8 +307,7 @@ class GLES2DecoderTestBase : public testing::Test {
     }
 
     virtual Buffer GetSharedMemoryBuffer(int32 shm_id) {
-      return shm_id == kSharedMemoryId || shm_id == gpu::kLatchSharedMemoryId ?
-          valid_buffer_ : invalid_buffer_;
+      return shm_id == kSharedMemoryId ? valid_buffer_ : invalid_buffer_;
     }
 
     void ClearSharedMemory() {