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

content/common/gpu/client/webgraphicscontext3d_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 "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "third_party/khronos/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 212 matching lines @@
 WebGraphicsContext3DCommandBufferImpl::ShareGroup::~ShareGroup() {
   DCHECK(contexts_.empty());
 }
 
 WebGraphicsContext3DCommandBufferImpl::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)
     : initialize_failed_(false),
       visible_(false),
       host_(host),
       surface_id_(surface_id),
       active_url_(active_url),
       context_lost_callback_(0),
       context_lost_reason_(GL_NO_ERROR),
       error_message_callback_(0),
       attributes_(attributes),
       gpu_preference_(attributes.preferDiscreteGPU ? gfx::PreferDiscreteGpu
                                                    : gfx::PreferIntegratedGpu),
       weak_ptr_factory_(this),
       initialized_(false),
       gl_(NULL),
       bind_generates_resources_(bind_generates_resources),
-      lose_context_when_out_of_memory_(lose_context_when_out_of_memory),
       mem_limits_(limits),
       flush_id_(0) {
   if (share_context) {
     DCHECK(!attributes_.shareResources);
     share_group_ = share_context->share_group_;
   } else {
     share_group_ = attributes_.shareResources
         ? GetDefaultShareGroupForHost(host)
         : scoped_refptr<WebGraphicsContext3DCommandBufferImpl::ShareGroup>(
             new ShareGroup());
@@ skipping 83 matching lines @@
   attribs.push_back(DEPTH_SIZE);
   attribs.push_back(attributes_.depth ? 24 : 0);
   attribs.push_back(STENCIL_SIZE);
   attribs.push_back(attributes_.stencil ? 8 : 0);
   attribs.push_back(SAMPLES);
   attribs.push_back(attributes_.antialias ? 4 : 0);
   attribs.push_back(SAMPLE_BUFFERS);
   attribs.push_back(attributes_.antialias ? 1 : 0);
   attribs.push_back(FAIL_IF_MAJOR_PERF_CAVEAT);
   attribs.push_back(attributes_.failIfMajorPerformanceCaveat ? 1 : 0);
-  attribs.push_back(LOSE_CONTEXT_WHEN_OUT_OF_MEMORY);
-  attribs.push_back(lose_context_when_out_of_memory_ ? 1 : 0);
   attribs.push_back(NONE);
 
   // Create a proxy to a command buffer in the GPU process.
   if (onscreen) {
     command_buffer_.reset(host_->CreateViewCommandBuffer(
         surface_id_,
         share_group_command_buffer,
         attribs,
         active_url_,
         gpu_preference_));
@@ skipping 54 matching lines @@
 
   if (attributes_.noAutomaticFlushes)
     gles2_helper_->SetAutomaticFlushes(false);
   // Create a transfer buffer used to copy resources between the renderer
   // process and the GPU process.
   transfer_buffer_ .reset(new gpu::TransferBuffer(gles2_helper_.get()));
 
   DCHECK(host_.get());
 
   // Create the object exposing the OpenGL API.
-  real_gl_.reset(
-      new gpu::gles2::GLES2Implementation(gles2_helper_.get(),
-                                          gles2_share_group,
-                                          transfer_buffer_.get(),
-                                          bind_generates_resources_,
-                                          lose_context_when_out_of_memory_,
-                                          command_buffer_.get()));
+  real_gl_.reset(new gpu::gles2::GLES2Implementation(
+      gles2_helper_.get(),
+      gles2_share_group,
+      transfer_buffer_.get(),
+      bind_generates_resources_,
+      command_buffer_.get()));
   gl_ = real_gl_.get();
 
   if (!real_gl_->Initialize(
       mem_limits_.start_transfer_buffer_size,
       mem_limits_.min_transfer_buffer_size,
       mem_limits_.max_transfer_buffer_size,
       mem_limits_.mapped_memory_reclaim_limit)) {
     LOG(ERROR) << "Failed to initialize GLES2Implementation.";
     return false;
   }
@@ skipping 741 matching lines @@
     return true;
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
   return state.error == gpu::error::kLostContext;
 }
 
 // static
 WebGraphicsContext3DCommandBufferImpl*
 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) {
   if (!host)
     return NULL;
 
   if (share_context && share_context->IsCommandBufferContextLost())
     return NULL;
 
-  bool bind_generates_resources = false;
-  return new WebGraphicsContext3DCommandBufferImpl(
-      0,
-      active_url,
-      host,
-      attributes,
-      bind_generates_resources,
-      lose_context_when_out_of_memory,
-      limits,
-      share_context);
+  return new WebGraphicsContext3DCommandBufferImpl(0,
+                                                   active_url,
+                                                   host,
+                                                   attributes,
+                                                   false,
+                                                   limits,
+                                                   share_context);
 }
 
 DELEGATE_TO_GL_5(texImageIOSurface2DCHROMIUM, TexImageIOSurface2DCHROMIUM,
                  WGC3Denum, WGC3Dint, WGC3Dint, WGC3Duint, WGC3Duint)
 
 DELEGATE_TO_GL_5(texStorage2DEXT, TexStorage2DEXT,
                  WGC3Denum, WGC3Dint, WGC3Duint, WGC3Dint, WGC3Dint)
 
 WebGLId WebGraphicsContext3DCommandBufferImpl::createQueryEXT() {
   GLuint o;
@@ skipping 171 matching lines @@
 
 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(
     const std::string& message, int id) {
   if (error_message_callback_) {
     blink::WebString str = blink::WebString::fromUTF8(message.c_str());
     error_message_callback_->onErrorMessage(str, id);
   }
 }
 
 }  // namespace content