OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/test/trace_event_analyzer.h" | 9 #include "base/test/trace_event_analyzer.h" |
10 #include "base/version.h" | 10 #include "base/version.h" |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 | 301 |
302 class WebGLMultisamplingTest : public GpuFeatureTest { | 302 class WebGLMultisamplingTest : public GpuFeatureTest { |
303 public: | 303 public: |
304 virtual void SetUpCommandLine(CommandLine* command_line) { | 304 virtual void SetUpCommandLine(CommandLine* command_line) { |
305 GpuFeatureTest::SetUpCommandLine(command_line); | 305 GpuFeatureTest::SetUpCommandLine(command_line); |
306 command_line->AppendSwitch(switches::kDisableGLMultisampling); | 306 command_line->AppendSwitch(switches::kDisableGLMultisampling); |
307 } | 307 } |
308 }; | 308 }; |
309 | 309 |
310 IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) { | 310 IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) { |
| 311 #if defined(OS_MACOSX) |
| 312 // Multisampling fails on virtualized mac os. |
| 313 GPUTestBotConfig test_bot; |
| 314 test_bot.LoadCurrentConfig(NULL); |
| 315 |
| 316 const std::vector<uint32>& gpu_vendor = test_bot.gpu_vendor(); |
| 317 if (gpu_vendor.size() == 1 && gpu_vendor[0] == 0x15AD) |
| 318 return; |
| 319 #endif |
| 320 |
311 const FilePath url(FILE_PATH_LITERAL("feature_multisampling.html")); | 321 const FilePath url(FILE_PATH_LITERAL("feature_multisampling.html")); |
312 RunTest(url, "\"FALSE\"", true); | 322 RunTest(url, "\"FALSE\"", true); |
313 } | 323 } |
314 | 324 |
315 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { | 325 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { |
316 #if defined(OS_WIN) | 326 #if defined(OS_WIN) |
317 // Accelerated canvas 2D is not supported on XP. | 327 // Accelerated canvas 2D is not supported on XP. |
318 GPUTestBotConfig test_bot; | 328 GPUTestBotConfig test_bot; |
319 test_bot.LoadCurrentConfig(NULL); | 329 test_bot.LoadCurrentConfig(NULL); |
320 if (test_bot.os() == GPUTestConfig::kOsWinXP) | 330 if (test_bot.os() == GPUTestConfig::kOsWinXP) |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
414 // indicate that the renderer is not simply spinning on RAF. | 424 // indicate that the renderer is not simply spinning on RAF. |
415 EXPECT_GT(stats.mean_us, 15000.0); | 425 EXPECT_GT(stats.mean_us, 15000.0); |
416 | 426 |
417 // Print out the trace events upon error to debug failures. | 427 // Print out the trace events upon error to debug failures. |
418 if (stats.mean_us <= 15000.0) { | 428 if (stats.mean_us <= 15000.0) { |
419 fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str()); | 429 fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str()); |
420 } | 430 } |
421 } | 431 } |
422 | 432 |
423 } // namespace anonymous | 433 } // namespace anonymous |
OLD | NEW |