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

gpu/command_buffer/client/gles2_implementation.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <GLES2/gl2.h>
 
 #include <map>
@@ skipping 162 matching lines @@
   // Alignment of allocations.
   static const unsigned int kAlignment = 4;
 
   // GL names for the buffers used to emulate client side buffers.
   static const GLuint kClientSideArrayId = 0xFEDCBA98u;
   static const GLuint kClientSideElementArrayId = 0xFEDCBA99u;
 
   // Number of swap buffers allowed before waiting.
   static const size_t kMaxSwapBuffers = 2;
 
-  GLES2Implementation(GLES2CmdHelper* helper,
-                      ShareGroup* share_group,
-                      TransferBufferInterface* transfer_buffer,
-                      bool bind_generates_resource,
-                      bool lose_context_when_out_of_memory,
-                      GpuControl* gpu_control);
+  GLES2Implementation(
+      GLES2CmdHelper* helper,
+      ShareGroup* share_group,
+      TransferBufferInterface* transfer_buffer,
+      bool bind_generates_resource,
+      GpuControl* gpu_control);
 
   virtual ~GLES2Implementation();
 
   bool Initialize(
       unsigned int starting_transfer_buffer_size,
       unsigned int min_transfer_buffer_size,
       unsigned int max_transfer_buffer_size,
       unsigned int mapped_memory_limit);
 
   // The GLES2CmdHelper being used by this GLES2Implementation. You can use
@@ skipping 386 matching lines @@
 
   bool IsExtensionAvailable(const char* ext);
 
   // Caches certain capabilties state. Return true if cached.
   bool SetCapabilityState(GLenum cap, bool enabled);
 
   IdHandlerInterface* GetIdHandler(int id_namespace) const;
 
   void FinishHelper();
 
+  // Asserts that the context is lost.
+  // NOTE: This is an expensive call and should only be called
+  // for error checking.
+  bool MustBeContextLost();
+
   void RunIfContextNotLost(const base::Closure& callback);
 
   void OnSwapBuffersComplete();
 
   // Remove the transfer buffer from the buffer tracker. For buffers used
   // asynchronously the memory is free:ed if the upload has completed. For
   // other buffers, the memory is either free:ed immediately or free:ed pending
   // a token.
   void RemoveTransferBuffer(BufferTracker::Buffer* buffer);
 
@@ skipping 112 matching lines @@
   scoped_ptr<VertexArrayObjectManager> vertex_array_object_manager_;
 
   GLuint reserved_ids_[2];
 
   // Current GL error bits.
   uint32 error_bits_;
 
   // Whether or not to print debugging info.
   bool debug_;
 
-  // When true, the context is lost when a GL_OUT_OF_MEMORY error occurs.
-  bool lose_context_when_out_of_memory_;
-
   // Used to check for single threaded access.
   int use_count_;
 
   // Map of GLenum to Strings for glGetString.  We need to cache these because
   // the pointer passed back to the client has to remain valid for eternity.
   typedef std::map<uint32, std::set<std::string> > GLStringMap;
   GLStringMap gl_strings_;
 
   // Similar cache for glGetRequestableExtensionsCHROMIUM. We don't
   // have an enum for this so handle it separately.
@@ skipping 64 matching lines @@
 
 inline bool GLES2Implementation::GetTexParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_