Revert of gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate.

gpu/command_buffer/client/gl_in_process_context.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 129 matching lines @@
   const int32 GREEN_SIZE     = 0x3023;
   const int32 RED_SIZE       = 0x3024;
   const int32 DEPTH_SIZE     = 0x3025;
   const int32 STENCIL_SIZE   = 0x3026;
   const int32 SAMPLES        = 0x3031;
   const int32 SAMPLE_BUFFERS = 0x3032;
   const int32 NONE           = 0x3038;
 
   // Chromium-specific attributes
   const int32 FAIL_IF_MAJOR_PERF_CAVEAT = 0x10002;
-  const int32 LOSE_CONTEXT_WHEN_OUT_OF_MEMORY = 0x10003;
 
   std::vector<int32> attrib_vector;
   if (attribs.alpha_size >= 0) {
     attrib_vector.push_back(ALPHA_SIZE);
     attrib_vector.push_back(attribs.alpha_size);
   }
   if (attribs.blue_size >= 0) {
     attrib_vector.push_back(BLUE_SIZE);
     attrib_vector.push_back(attribs.blue_size);
   }
@@ skipping 18 matching lines @@
     attrib_vector.push_back(attribs.samples);
   }
   if (attribs.sample_buffers >= 0) {
     attrib_vector.push_back(SAMPLE_BUFFERS);
     attrib_vector.push_back(attribs.sample_buffers);
   }
   if (attribs.fail_if_major_perf_caveat > 0) {
     attrib_vector.push_back(FAIL_IF_MAJOR_PERF_CAVEAT);
     attrib_vector.push_back(attribs.fail_if_major_perf_caveat);
   }
-  if (attribs.lose_context_when_out_of_memory > 0) {
-    attrib_vector.push_back(LOSE_CONTEXT_WHEN_OUT_OF_MEMORY);
-    attrib_vector.push_back(attribs.lose_context_when_out_of_memory);
-  }
   attrib_vector.push_back(NONE);
 
   base::Closure wrapped_callback =
       base::Bind(&GLInProcessContextImpl::OnContextLost, AsWeakPtr());
   command_buffer_.reset(new InProcessCommandBuffer(service));
 
   scoped_ptr<base::AutoLock> scoped_shared_context_lock;
   scoped_refptr<gles2::ShareGroup> share_group;
   InProcessCommandBuffer* share_command_buffer = NULL;
   if (use_global_share_group) {
@@ skipping 45 matching lines @@
   transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get()));
 
   bool bind_generates_resources = false;
 
   // Create the object exposing the OpenGL API.
   gles2_implementation_.reset(new gles2::GLES2Implementation(
       gles2_helper_.get(),
       share_group,
       transfer_buffer_.get(),
       bind_generates_resources,
-      attribs.lose_context_when_out_of_memory > 0,
       command_buffer_.get()));
 
   if (use_global_share_group) {
     g_all_shared_contexts.Get().insert(this);
     scoped_shared_context_lock.reset();
   }
 
   if (!gles2_implementation_->Initialize(
       kStartTransferBufferSize,
       kMinTransferBufferSize,
@@ skipping 32 matching lines @@
 }  // anonymous namespace
 
 GLInProcessContextAttribs::GLInProcessContextAttribs()
     : alpha_size(-1),
       blue_size(-1),
       green_size(-1),
       red_size(-1),
       depth_size(-1),
       stencil_size(-1),
       samples(-1),
-      sample_buffers(-1),
-      fail_if_major_perf_caveat(-1),
-      lose_context_when_out_of_memory(-1) {}
+      sample_buffers(-1) {}
 
 // static
 GLInProcessContext* GLInProcessContext::CreateContext(
     bool is_offscreen,
     gfx::AcceleratedWidget window,
     const gfx::Size& size,
     bool share_resources,
     const GLInProcessContextAttribs& attribs,
     gfx::GpuPreference gpu_preference) {
   scoped_ptr<GLInProcessContextImpl> context(
@@ skipping 31 matching lines @@
       surface->GetSize(),
       attribs,
       gpu_preference,
       service))
     return NULL;
 
   return context.release();
 }
 
 }  // namespace gpu