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 22 matching lines...) Expand all Loading... |
33 attributes.depth_size = 0; | 33 attributes.depth_size = 0; |
34 attributes.stencil_size = 0; | 34 attributes.stencil_size = 0; |
35 attributes.samples = 0; | 35 attributes.samples = 0; |
36 attributes.sample_buffers = 0; | 36 attributes.sample_buffers = 0; |
37 attributes.bind_generates_resource = false; | 37 attributes.bind_generates_resource = false; |
38 constexpr bool automatic_flushes = false; | 38 constexpr bool automatic_flushes = false; |
39 constexpr bool support_locking = false; | 39 constexpr bool support_locking = false; |
40 return make_scoped_refptr(new content::ContextProviderCommandBuffer( | 40 return make_scoped_refptr(new content::ContextProviderCommandBuffer( |
41 std::move(gpu_channel_host), gpu::GPU_STREAM_DEFAULT, | 41 std::move(gpu_channel_host), gpu::GPU_STREAM_DEFAULT, |
42 gpu::GpuStreamPriority::NORMAL, gpu::kNullSurfaceHandle, GURL(), | 42 gpu::GpuStreamPriority::NORMAL, gpu::kNullSurfaceHandle, GURL(), |
43 automatic_flushes, support_locking, gpu::SharedMemoryLimits(), attributes, | 43 gl::PreferIntegratedGpu, automatic_flushes, support_locking, |
44 nullptr, content::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING)); | 44 gpu::SharedMemoryLimits(), attributes, nullptr, |
| 45 content::command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING)); |
45 } | 46 } |
46 | 47 |
47 class ContextTestBase : public content::ContentBrowserTest { | 48 class ContextTestBase : public content::ContentBrowserTest { |
48 public: | 49 public: |
49 void SetUpOnMainThread() override { | 50 void SetUpOnMainThread() override { |
50 // 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 |
51 // out. | 52 // out. |
52 if (!content::BrowserGpuChannelHostFactory::CanUseForTesting()) | 53 if (!content::BrowserGpuChannelHostFactory::CanUseForTesting()) |
53 return; | 54 return; |
54 | 55 |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 shim->SimulateCrash(); | 283 shim->SimulateCrash(); |
283 run_loop.Run(); | 284 run_loop.Run(); |
284 | 285 |
285 EXPECT_EQ(1, counter); | 286 EXPECT_EQ(1, counter); |
286 EXPECT_FALSE(IsChannelEstablished()); | 287 EXPECT_FALSE(IsChannelEstablished()); |
287 EstablishAndWait(); | 288 EstablishAndWait(); |
288 EXPECT_TRUE(IsChannelEstablished()); | 289 EXPECT_TRUE(IsChannelEstablished()); |
289 } | 290 } |
290 | 291 |
291 } // namespace content | 292 } // namespace content |
OLD | NEW |