Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Side by Side Diff: chrome/test/gpu/gpu_feature_browsertest.cc

Issue 11814003: Disable GpuFeatureTest.WebGLBlocked and WebGLAllowed on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/test/trace_event_analyzer.h" 10 #include "base/test/trace_event_analyzer.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 #define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled 249 #define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled
250 #endif 250 #endif
251 251
252 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest, 252 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest,
253 MAYBE_AcceleratedCompositingDisabled) { 253 MAYBE_AcceleratedCompositingDisabled) {
254 // Compositing is always on for Windows Aura. 254 // Compositing is always on for Windows Aura.
255 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); 255 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
256 RunEventTest(url, kSwapBuffersEvent, false); 256 RunEventTest(url, kSwapBuffersEvent, false);
257 } 257 }
258 258
259 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) { 259 // Flaky on ChromeOS, http://crbug.com/168972
260 #if defined(OS_CHROMEOS)
261 #define MAYBE_WebGLAllowed DISABLED_WebGLAllowed
262 #else
263 #define MAYBE_WebGLAllowed WebGLAllowed
264 #endif
265 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) {
260 GpuFeatureType type = 266 GpuFeatureType type =
261 GpuDataManager::GetInstance()->GetBlacklistedFeatures(); 267 GpuDataManager::GetInstance()->GetBlacklistedFeatures();
262 EXPECT_EQ(type, 0); 268 EXPECT_EQ(type, 0);
263 269
264 const FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); 270 const FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
265 RunEventTest(url, kWebGLCreationEvent, true); 271 RunEventTest(url, kWebGLCreationEvent, true);
266 } 272 }
267 273
268 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) { 274 // Flaky on ChromeOS, http://crbug.com/168972
275 #if defined(OS_CHROMEOS)
276 #define MAYBE_WebGLBlocked DISABLED_WebGLBlocked
277 #else
278 #define MAYBE_WebGLBlocked WebGLBlocked
279 #endif
280 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLBlocked) {
269 const std::string json_blacklist = 281 const std::string json_blacklist =
270 "{\n" 282 "{\n"
271 " \"name\": \"gpu blacklist\",\n" 283 " \"name\": \"gpu blacklist\",\n"
272 " \"version\": \"1.0\",\n" 284 " \"version\": \"1.0\",\n"
273 " \"entries\": [\n" 285 " \"entries\": [\n"
274 " {\n" 286 " {\n"
275 " \"id\": 1,\n" 287 " \"id\": 1,\n"
276 " \"blacklist\": [\n" 288 " \"blacklist\": [\n"
277 " \"webgl\"\n" 289 " \"webgl\"\n"
278 " ]\n" 290 " ]\n"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 base::StringPrintf( 579 base::StringPrintf(
568 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " 580 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d "
569 "Expected %d", offset_i, offsets[offset_i], 581 "Expected %d", offset_i, offsets[offset_i],
570 old_width, new_width, num_creates, expected_creates); 582 old_width, new_width, num_creates, expected_creates);
571 } 583 }
572 } 584 }
573 } 585 }
574 #endif 586 #endif
575 587
576 } // namespace anonymous 588 } // namespace anonymous
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698