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/run_loop.h" | 6 #include "base/run_loop.h" |
7 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 7 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
8 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 8 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
9 #include "content/common/gpu/client/context_provider_command_buffer.h" | 9 #include "content/common/gpu/client/context_provider_command_buffer.h" |
10 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 10 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" |
11 #include "content/common/gpu/gpu_process_launch_causes.h" | 11 #include "content/common/gpu/gpu_process_launch_causes.h" |
12 #include "content/public/browser/gpu_data_manager.h" | 12 #include "content/public/browser/gpu_data_manager.h" |
13 #include "content/public/common/content_switches.h" | 13 #include "content/public/common/content_switches.h" |
14 #include "content/public/test/content_browser_test.h" | 14 #include "content/public/test/content_browser_test.h" |
| 15 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" |
15 #include "ui/gl/gl_switches.h" | 16 #include "ui/gl/gl_switches.h" |
16 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.
h" | |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 using content::WebGraphicsContext3DCommandBufferImpl; | 20 using content::WebGraphicsContext3DCommandBufferImpl; |
21 | 21 |
22 const content::CauseForGpuLaunch kInitCause = | 22 const content::CauseForGpuLaunch kInitCause = |
23 content:: | 23 content:: |
24 CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE; | 24 CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE; |
25 | 25 |
26 class ContextTestBase : public content::ContentBrowserTest { | 26 class ContextTestBase : public content::ContentBrowserTest { |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 shim->SimulateCrash(); | 192 shim->SimulateCrash(); |
193 run_loop.Run(); | 193 run_loop.Run(); |
194 | 194 |
195 EXPECT_EQ(1, counter); | 195 EXPECT_EQ(1, counter); |
196 EXPECT_FALSE(IsChannelEstablished()); | 196 EXPECT_FALSE(IsChannelEstablished()); |
197 EstablishAndWait(); | 197 EstablishAndWait(); |
198 EXPECT_TRUE(IsChannelEstablished()); | 198 EXPECT_TRUE(IsChannelEstablished()); |
199 } | 199 } |
200 | 200 |
201 } // namespace content | 201 } // namespace content |
OLD | NEW |