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

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.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 CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 #define CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 106 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(ShareGroup);
   };
 
   WebGraphicsContext3DCommandBufferImpl(
       int surface_id,
       const GURL& active_url,
       GpuChannelHost* host,
       const Attributes& attributes,
       bool bind_generates_resources,
-      bool lose_context_when_out_of_memory,
       const SharedMemoryLimits& limits,
       WebGraphicsContext3DCommandBufferImpl* share_context);
 
   virtual ~WebGraphicsContext3DCommandBufferImpl();
 
   CommandBufferProxyImpl* GetCommandBufferProxy() {
     return command_buffer_.get();
   }
 
   CONTENT_EXPORT gpu::ContextSupport* GetContextSupport();
 
   gpu::gles2::GLES2Implementation* GetImplementation() {
     return real_gl_.get();
   }
 
   // Return true if GPU process reported context lost or there was a
   // problem communicating with the GPU process.
   bool IsCommandBufferContextLost();
 
   // Create & initialize a WebGraphicsContext3DCommandBufferImpl.  Return NULL
   // on any failure.
   static CONTENT_EXPORT WebGraphicsContext3DCommandBufferImpl*
       CreateOffscreenContext(
           GpuChannelHost* host,
           const WebGraphicsContext3D::Attributes& attributes,
-          bool lose_context_when_out_of_memory,
           const GURL& active_url,
           const SharedMemoryLimits& limits,
           WebGraphicsContext3DCommandBufferImpl* share_context);
 
   size_t GetMappedMemoryLimit() {
     return mem_limits_.mapped_memory_reclaim_limit;
   }
 
   //----------------------------------------------------------------------
   // WebGraphicsContext3D methods
@@ skipping 518 matching lines @@
     CONTEXT_LOST          = 0x300E
   };
   // WebGraphicsContext3DCommandBufferImpl configuration attributes. Those in
   // the 16-bit range are the same as used by EGL. Those outside the 16-bit
   // range are unique to Chromium. Attributes are matched using a closest fit
   // algorithm.
   // Changes to this enum should also be copied to
   // gpu/command_buffer/common/gles2_cmd_utils.cc and to
   // gpu/command_buffer/client/gl_in_process_context.cc
   enum Attribute {
-    ALPHA_SIZE = 0x3021,
-    BLUE_SIZE = 0x3022,
-    GREEN_SIZE = 0x3023,
-    RED_SIZE = 0x3024,
-    DEPTH_SIZE = 0x3025,
-    STENCIL_SIZE = 0x3026,
-    SAMPLES = 0x3031,
-    SAMPLE_BUFFERS = 0x3032,
-    HEIGHT = 0x3056,
-    WIDTH = 0x3057,
-    NONE = 0x3038,  // Attrib list = terminator
-    SHARE_RESOURCES = 0x10000,
-    BIND_GENERATES_RESOURCES = 0x10001,
-    FAIL_IF_MAJOR_PERF_CAVEAT = 0x10002,
-    LOSE_CONTEXT_WHEN_OUT_OF_MEMORY = 0x10003,
+    ALPHA_SIZE                = 0x3021,
+    BLUE_SIZE                 = 0x3022,
+    GREEN_SIZE                = 0x3023,
+    RED_SIZE                  = 0x3024,
+    DEPTH_SIZE                = 0x3025,
+    STENCIL_SIZE              = 0x3026,
+    SAMPLES                   = 0x3031,
+    SAMPLE_BUFFERS            = 0x3032,
+    HEIGHT                    = 0x3056,
+    WIDTH                     = 0x3057,
+    NONE                      = 0x3038,  // Attrib list = terminator
+    SHARE_RESOURCES           = 0x10000,
+    BIND_GENERATES_RESOURCES  = 0x10001,
+    FAIL_IF_MAJOR_PERF_CAVEAT = 0x10002
   };
   friend class WebGraphicsContext3DErrorMessageCallback;
 
   // Initialize the underlying GL context. May be called multiple times; second
   // and subsequent calls are ignored. Must be called from the thread that is
   // going to use this object to issue GL commands (which might not be the main
   // thread).
   bool MaybeInitializeGL();
 
   bool InitializeCommandBuffer(bool onscreen,
@@ skipping 46 matching lines @@
 
   bool initialized_;
   scoped_ptr<CommandBufferProxyImpl> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
   scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
   gpu::gles2::GLES2Interface* gl_;
   scoped_ptr<gpu::gles2::GLES2Implementation> real_gl_;
   scoped_ptr<gpu::gles2::GLES2Interface> trace_gl_;
   Error last_error_;
   bool bind_generates_resources_;
-  bool lose_context_when_out_of_memory_;
   SharedMemoryLimits mem_limits_;
 
   uint32_t flush_id_;
   scoped_refptr<ShareGroup> share_group_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_