| 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/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/test/trace_event_analyzer.h" | 10 #include "base/test/trace_event_analyzer.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 return; | 266 return; |
| 267 | 267 |
| 268 const base::FilePath url(FILE_PATH_LITERAL("feature_multisampling.html")); | 268 const base::FilePath url(FILE_PATH_LITERAL("feature_multisampling.html")); |
| 269 RunTest(url, "\"TRUE\"", true); | 269 RunTest(url, "\"TRUE\"", true); |
| 270 } | 270 } |
| 271 | 271 |
| 272 class WebGLMultisamplingTest : public GpuFeatureTest { | 272 class WebGLMultisamplingTest : public GpuFeatureTest { |
| 273 public: | 273 public: |
| 274 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 274 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 275 GpuFeatureTest::SetUpCommandLine(command_line); | 275 GpuFeatureTest::SetUpCommandLine(command_line); |
| 276 command_line->AppendSwitch(switches::kDisableGLMultisampling); | 276 command_line->AppendSwitch("disable_multisampling"); |
| 277 } | 277 } |
| 278 }; | 278 }; |
| 279 | 279 |
| 280 IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) { | 280 IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) { |
| 281 // Multisampling fails on virtualized mac os. | 281 // Multisampling fails on virtualized mac os. |
| 282 if (gpu::GPUTestBotConfig::CurrentConfigMatches("MAC VMWARE")) | 282 if (gpu::GPUTestBotConfig::CurrentConfigMatches("MAC VMWARE")) |
| 283 return; | 283 return; |
| 284 | 284 |
| 285 const base::FilePath url(FILE_PATH_LITERAL("feature_multisampling.html")); | 285 const base::FilePath url(FILE_PATH_LITERAL("feature_multisampling.html")); |
| 286 RunTest(url, "\"FALSE\"", true); | 286 RunTest(url, "\"FALSE\"", true); |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " | 491 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " |
| 492 "Expected %d", offset_i, offsets[offset_i], | 492 "Expected %d", offset_i, offsets[offset_i], |
| 493 old_width, new_width, num_creates, expected_creates); | 493 old_width, new_width, num_creates, expected_creates); |
| 494 } | 494 } |
| 495 } | 495 } |
| 496 LOG(INFO) << "finished test"; | 496 LOG(INFO) << "finished test"; |
| 497 } | 497 } |
| 498 #endif | 498 #endif |
| 499 | 499 |
| 500 } // namespace | 500 } // namespace |
| OLD | NEW |