| 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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 command_line->AppendSwitch(switches::kDisableExperimentalWebGL); | 286 command_line->AppendSwitch(switches::kDisableExperimentalWebGL); |
| 287 #endif | 287 #endif |
| 288 } | 288 } |
| 289 }; | 289 }; |
| 290 | 290 |
| 291 IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) { | 291 IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) { |
| 292 const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); | 292 const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); |
| 293 RunEventTest(url, kWebGLCreationEvent, false); | 293 RunEventTest(url, kWebGLCreationEvent, false); |
| 294 } | 294 } |
| 295 | 295 |
| 296 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX) |
| 297 // http://crbug.com/314745 |
| 298 #define MultisamplingAllowed DISABLED_MultisamplingAllowed |
| 299 #endif |
| 296 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) { | 300 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) { |
| 297 EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( | 301 EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( |
| 298 gpu::GPU_FEATURE_TYPE_MULTISAMPLING)); | 302 gpu::GPU_FEATURE_TYPE_MULTISAMPLING)); |
| 299 | 303 |
| 300 // Multisampling is not supported if running on top of osmesa. | 304 // Multisampling is not supported if running on top of osmesa. |
| 301 if (gfx::GetGLImplementation() != gfx::kGLImplementationOSMesaGL) | 305 if (gfx::GetGLImplementation() != gfx::kGLImplementationOSMesaGL) |
| 302 return; | 306 return; |
| 303 | 307 |
| 304 // Linux Intel uses mesa driver, where multisampling is not supported. | 308 // Linux Intel uses mesa driver, where multisampling is not supported. |
| 305 // Multisampling is also not supported on virtualized mac os. | 309 // Multisampling is also not supported on virtualized mac os. |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 565 base::StringPrintf( | 569 base::StringPrintf( |
| 566 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " | 570 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " |
| 567 "Expected %d", offset_i, offsets[offset_i], | 571 "Expected %d", offset_i, offsets[offset_i], |
| 568 old_width, new_width, num_creates, expected_creates); | 572 old_width, new_width, num_creates, expected_creates); |
| 569 } | 573 } |
| 570 } | 574 } |
| 571 } | 575 } |
| 572 #endif | 576 #endif |
| 573 | 577 |
| 574 } // namespace | 578 } // namespace |
| OLD | NEW |