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

webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.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 "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 55 matching lines @@
 
 static base::LazyInstance<GLES2Initializer> g_gles2_initializer =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace anonymous
 
 // static
 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
 WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
     const blink::WebGraphicsContext3D::Attributes& attributes,
-    bool lose_context_when_out_of_memory,
     gfx::AcceleratedWidget window) {
   DCHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone);
-  bool is_offscreen = false;
   return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl(
-      scoped_ptr< ::gpu::GLInProcessContext>(),
-      attributes,
-      lose_context_when_out_of_memory,
-      is_offscreen,
-      window));
+      scoped_ptr< ::gpu::GLInProcessContext>(), attributes, false, window));
 }
 
 // static
 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
 WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
-    const blink::WebGraphicsContext3D::Attributes& attributes,
-    bool lose_context_when_out_of_memory) {
-  bool is_offscreen = true;
+    const blink::WebGraphicsContext3D::Attributes& attributes) {
   return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl(
       scoped_ptr< ::gpu::GLInProcessContext>(),
       attributes,
-      lose_context_when_out_of_memory,
-      is_offscreen,
+      true,
       gfx::kNullAcceleratedWidget));
 }
 
 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
 WebGraphicsContext3DInProcessCommandBufferImpl::WrapContext(
     scoped_ptr< ::gpu::GLInProcessContext> context,
     const blink::WebGraphicsContext3D::Attributes& attributes) {
-  bool lose_context_when_out_of_memory = false;  // Not used.
-  bool is_offscreen = true;                      // Not used.
   return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl(
       context.Pass(),
       attributes,
-      lose_context_when_out_of_memory,
-      is_offscreen,
+      true /* is_offscreen. Not used. */,
       gfx::kNullAcceleratedWidget /* window. Not used. */));
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     WebGraphicsContext3DInProcessCommandBufferImpl(
         scoped_ptr< ::gpu::GLInProcessContext> context,
         const blink::WebGraphicsContext3D::Attributes& attributes,
-        bool lose_context_when_out_of_memory,
         bool is_offscreen,
         gfx::AcceleratedWidget window)
     : is_offscreen_(is_offscreen),
       window_(window),
       initialized_(false),
       initialize_failed_(false),
       context_(context.Pass()),
       gl_(NULL),
       context_lost_callback_(NULL),
       context_lost_reason_(GL_NO_ERROR),
       attributes_(attributes),
-      lose_context_when_out_of_memory_(lose_context_when_out_of_memory),
-      flush_id_(0) {}
+      flush_id_(0) {
+}
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     ~WebGraphicsContext3DInProcessCommandBufferImpl() {
 }
 
 // static
 void WebGraphicsContext3DInProcessCommandBufferImpl::ConvertAttributes(
     const blink::WebGraphicsContext3D::Attributes& attributes,
     ::gpu::GLInProcessContextAttribs* output_attribs) {
   output_attribs->alpha_size = attributes.alpha ? 8 : 0;
@@ skipping 17 matching lines @@
 
   if (!context_) {
     // TODO(kbr): More work will be needed in this implementation to
     // properly support GPU switching. Like in the out-of-process
     // command buffer implementation, all previously created contexts
     // will need to be lost either when the first context requesting the
     // discrete GPU is created, or the last one is destroyed.
     gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
 
     ::gpu::GLInProcessContextAttribs attrib_struct;
-    ConvertAttributes(attributes_, &attrib_struct);
-    attrib_struct.lose_context_when_out_of_memory =
-        lose_context_when_out_of_memory_;
+    ConvertAttributes(attributes_, &attrib_struct),
 
     context_.reset(GLInProcessContext::CreateContext(
         is_offscreen_,
         window_,
         gfx::Size(1, 1),
         attributes_.shareResources,
         attrib_struct,
         gpu_preference));
   }
 
@@ skipping 1011 matching lines @@
 
 DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM,
     WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei,
     WGC3Denum, WGC3Denum, const void*)
 
 DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM,
     WGC3Denum)
 
 }  // namespace gpu
 }  // namespace webkit