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 "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 8 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
9 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 9 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
10 #include "content/common/gpu/client/context_provider_command_buffer.h" | 10 #include "content/common/gpu/client/context_provider_command_buffer.h" |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 bool event = false; | 199 bool event = false; |
200 GetFactory()->EstablishGpuChannel( | 200 GetFactory()->EstablishGpuChannel( |
201 kInitCause, | 201 kInitCause, |
202 base::Bind(&BrowserGpuChannelHostFactoryTest::Signal, &event)); | 202 base::Bind(&BrowserGpuChannelHostFactoryTest::Signal, &event)); |
203 EXPECT_TRUE(event); | 203 EXPECT_TRUE(event); |
204 EXPECT_EQ(gpu_channel.get(), GetGpuChannel()); | 204 EXPECT_EQ(gpu_channel.get(), GetGpuChannel()); |
205 } | 205 } |
206 #endif | 206 #endif |
207 | 207 |
208 // Test fails on Windows because GPU Channel set-up fails. | 208 // Test fails on Windows because GPU Channel set-up fails. |
209 // Mac only fails GPU set-up on MacOS 10.6, but we have no version-specific | 209 #if !defined(OS_WIN) |
210 // macros for disabling tests. | |
211 #if !defined(OS_WIN) && !defined(OS_MACOSX) | |
212 #define MAYBE_GrContextKeepsGpuChannelAlive GrContextKeepsGpuChannelAlive | 210 #define MAYBE_GrContextKeepsGpuChannelAlive GrContextKeepsGpuChannelAlive |
213 #else | 211 #else |
214 #define MAYBE_GrContextKeepsGpuChannelAlive \ | 212 #define MAYBE_GrContextKeepsGpuChannelAlive \ |
215 DISABLED_GrContextKeepsGpuChannelAlive | 213 DISABLED_GrContextKeepsGpuChannelAlive |
216 #endif | 214 #endif |
217 IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest, | 215 IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest, |
218 MAYBE_GrContextKeepsGpuChannelAlive) { | 216 MAYBE_GrContextKeepsGpuChannelAlive) { |
219 // Test for crbug.com/551143 | 217 // Test for crbug.com/551143 |
220 // This test verifies that holding a reference to the GrContext created by | 218 // This test verifies that holding a reference to the GrContext created by |
221 // a ContextProviderCommandBuffer will keep the gpu channel alive after the | 219 // a ContextProviderCommandBuffer will keep the gpu channel alive after the |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 shim->SimulateCrash(); | 277 shim->SimulateCrash(); |
280 run_loop.Run(); | 278 run_loop.Run(); |
281 | 279 |
282 EXPECT_EQ(1, counter); | 280 EXPECT_EQ(1, counter); |
283 EXPECT_FALSE(IsChannelEstablished()); | 281 EXPECT_FALSE(IsChannelEstablished()); |
284 EstablishAndWait(); | 282 EstablishAndWait(); |
285 EXPECT_TRUE(IsChannelEstablished()); | 283 EXPECT_TRUE(IsChannelEstablished()); |
286 } | 284 } |
287 | 285 |
288 } // namespace content | 286 } // namespace content |
OLD | NEW |