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

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

Issue 26483002: Disable GpuFeatureTest.WebGLAllowed everywhere (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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/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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 #define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled 239 #define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled
240 #endif 240 #endif
241 241
242 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest, 242 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest,
243 MAYBE_AcceleratedCompositingDisabled) { 243 MAYBE_AcceleratedCompositingDisabled) {
244 // Compositing is always on for Windows Aura. 244 // Compositing is always on for Windows Aura.
245 const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); 245 const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
246 RunEventTest(url, kSwapBuffersEvent, false); 246 RunEventTest(url, kSwapBuffersEvent, false);
247 } 247 }
248 248
249 #if defined(OS_CHROMEOS) 249 // Times out: http://crbug.com/166060
250 #define MAYBE_WebGLAllowed DISABLED_WebGLAllowed 250 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, DISABLED_WebGLAllowed) {
251 #else
252 #define MAYBE_WebGLAllowed WebGLAllowed
253 #endif
254 // Times out on CrOS: http://crbug.com/166060
255 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) {
256 EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( 251 EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
257 gpu::GPU_FEATURE_TYPE_WEBGL)); 252 gpu::GPU_FEATURE_TYPE_WEBGL));
258 253
259 const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); 254 const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
260 RunEventTest(url, kWebGLCreationEvent, true); 255 RunEventTest(url, kWebGLCreationEvent, true);
261 } 256 }
262 257
263 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) { 258 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
264 const std::string json_blacklist = 259 const std::string json_blacklist =
265 "{\n" 260 "{\n"
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 base::StringPrintf( 540 base::StringPrintf(
546 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " 541 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d "
547 "Expected %d", offset_i, offsets[offset_i], 542 "Expected %d", offset_i, offsets[offset_i],
548 old_width, new_width, num_creates, expected_creates); 543 old_width, new_width, num_creates, expected_creates);
549 } 544 }
550 } 545 }
551 } 546 }
552 #endif 547 #endif
553 548
554 } // namespace 549 } // namespace
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