OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/memory/ptr_util.h" | 6 #include "base/memory/ptr_util.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 9 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
10 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 10 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 // any alpha, depth, stencil, antialiasing. | 32 // any alpha, depth, stencil, antialiasing. |
33 gpu::gles2::ContextCreationAttribHelper attributes; | 33 gpu::gles2::ContextCreationAttribHelper attributes; |
34 attributes.alpha_size = -1; | 34 attributes.alpha_size = -1; |
35 attributes.depth_size = 0; | 35 attributes.depth_size = 0; |
36 attributes.stencil_size = 0; | 36 attributes.stencil_size = 0; |
37 attributes.samples = 0; | 37 attributes.samples = 0; |
38 attributes.sample_buffers = 0; | 38 attributes.sample_buffers = 0; |
39 attributes.bind_generates_resource = false; | 39 attributes.bind_generates_resource = false; |
40 bool automatic_flushes = false; | 40 bool automatic_flushes = false; |
41 return make_scoped_refptr(new content::ContextProviderCommandBuffer( | 41 return make_scoped_refptr(new content::ContextProviderCommandBuffer( |
42 base::WrapUnique(new content::WebGraphicsContext3DCommandBufferImpl( | 42 std::move(gpu_channel_host), gpu::kNullSurfaceHandle, GURL(), |
43 gpu::kNullSurfaceHandle, GURL(), std::move(gpu_channel_host), | 43 gfx::PreferIntegratedGpu, automatic_flushes, gpu::SharedMemoryLimits(), |
44 gfx::PreferIntegratedGpu, automatic_flushes)), | 44 attributes, nullptr, |
45 gpu::SharedMemoryLimits(), attributes, nullptr, | |
46 content::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING)); | 45 content::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING)); |
47 } | 46 } |
48 | 47 |
49 class ContextTestBase : public content::ContentBrowserTest { | 48 class ContextTestBase : public content::ContentBrowserTest { |
50 public: | 49 public: |
51 void SetUpOnMainThread() override { | 50 void SetUpOnMainThread() override { |
52 // This may leave the provider_ null in some cases, so tests need to early | 51 // This may leave the provider_ null in some cases, so tests need to early |
53 // out. | 52 // out. |
54 if (!content::BrowserGpuChannelHostFactory::CanUseForTesting()) | 53 if (!content::BrowserGpuChannelHostFactory::CanUseForTesting()) |
55 return; | 54 return; |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 shim->SimulateCrash(); | 283 shim->SimulateCrash(); |
285 run_loop.Run(); | 284 run_loop.Run(); |
286 | 285 |
287 EXPECT_EQ(1, counter); | 286 EXPECT_EQ(1, counter); |
288 EXPECT_FALSE(IsChannelEstablished()); | 287 EXPECT_FALSE(IsChannelEstablished()); |
289 EstablishAndWait(); | 288 EstablishAndWait(); |
290 EXPECT_TRUE(IsChannelEstablished()); | 289 EXPECT_TRUE(IsChannelEstablished()); |
291 } | 290 } |
292 | 291 |
293 } // namespace content | 292 } // namespace content |
OLD | NEW |