Merge 261120 "gpu: Lose context when BeginQueryEXT fails to allo..."

gpu/command_buffer/tests/gl_manager.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_TESTS_GL_MANAGER_H_
 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/feature_info.h"
@@ skipping 35 matching lines @@
     // The size of the backbuffer.
     gfx::Size size;
     // If not null will share resources with this context.
     GLManager* share_group_manager;
     // If not null will share a mailbox manager with this context.
     GLManager* share_mailbox_manager;
     // If not null will create a virtual manager based on this context.
     GLManager* virtual_manager;
     // Whether or not glBindXXX generates a resource.
     bool bind_generates_resource;
+    // Whether or not the context is auto-lost when GL_OUT_OF_MEMORY occurs.
+    bool lose_context_when_out_of_memory;
     // Whether or not it's ok to lose the context.
     bool context_lost_allowed;
     // Image manager to be used.
     gles2::ImageManager* image_manager;
     // GpuMemoryBuffer factory to be used.
     GpuMemoryBufferFactory* gpu_memory_buffer_factory;
   };
   GLManager();
   ~GLManager();
 
@@ skipping 47 matching lines @@
   // Used on Android to virtualize GL for all contexts.
   static int use_count_;
   static scoped_refptr<gfx::GLShareGroup>* base_share_group_;
   static scoped_refptr<gfx::GLSurface>* base_surface_;
   static scoped_refptr<gfx::GLContext>* base_context_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_