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

content/browser/gpu/gpu_ipc_browsertests.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/run_loop.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ skipping 17 matching lines @@
   virtual void SetUpOnMainThread() OVERRIDE {
     if (!content::BrowserGpuChannelHostFactory::CanUseForTesting())
       return;
 
     if (!content::BrowserGpuChannelHostFactory::instance())
       content::BrowserGpuChannelHostFactory::Initialize(true);
 
     content::BrowserGpuChannelHostFactory* factory =
         content::BrowserGpuChannelHostFactory::instance();
     CHECK(factory);
+    bool lose_context_when_out_of_memory = false;
     scoped_refptr<content::GpuChannelHost> gpu_channel_host(
         factory->EstablishGpuChannelSync(kInitCause));
     context_.reset(
         WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
             gpu_channel_host.get(),
             blink::WebGraphicsContext3D::Attributes(),
+            lose_context_when_out_of_memory,
             GURL(),
             WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
             NULL));
     CHECK(context_.get());
     context_->makeContextCurrent();
     context_support_ = context_->GetContextSupport();
     ContentBrowserTest::SetUpOnMainThread();
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
@@ skipping 64 matching lines @@
   GpuChannelHost* GetGpuChannel() {
     return GetFactory()->GetGpuChannel();
   }
 
   static void Signal(bool *event) {
     CHECK_EQ(*event, false);
     *event = true;
   }
 
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContext() {
+    bool lose_context_when_out_of_memory = false;
     return make_scoped_ptr(
         WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
             GetGpuChannel(),
             blink::WebGraphicsContext3D::Attributes(),
+            lose_context_when_out_of_memory,
             GURL(),
             WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
             NULL));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest, Basic) {
   if (!context_)
     return;
 
@@ skipping 56 matching lines @@
   shim->SimulateCrash();
   run_loop.Run();
 
   EXPECT_EQ(1, counter);
   EXPECT_FALSE(IsChannelEstablished());
   EstablishAndWait();
   EXPECT_TRUE(IsChannelEstablished());
 }
 
 }  // namespace content