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

Side by Side Diff: chrome/test/perf/frame_rate/frame_rate_tests.cc

Issue 167713003: Remove allow-webui-compositing switch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
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 <map> 5 #include <map>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 return test_path; 87 return test_path;
88 } 88 }
89 89
90 virtual void SetUp() { 90 virtual void SetUp() {
91 if (HasFlag(kUseReferenceBuild)) 91 if (HasFlag(kUseReferenceBuild))
92 UseReferenceBuild(); 92 UseReferenceBuild();
93 93
94 // Turn on chrome.Interval to get higher-resolution timestamps on frames. 94 // Turn on chrome.Interval to get higher-resolution timestamps on frames.
95 launch_arguments_.AppendSwitch(switches::kEnableBenchmarking); 95 launch_arguments_.AppendSwitch(switches::kEnableBenchmarking);
96 96
97 // UI tests boot up render views starting from about:blank. This causes
98 // the renderer to start up thinking it cannot use the GPU. To work
99 // around that, and allow the frame rate test to use the GPU, we must
100 // pass kAllowWebUICompositing.
101 launch_arguments_.AppendSwitch(switches::kAllowWebUICompositing);
102
103 // Some of the tests may launch http requests through JSON or AJAX 97 // Some of the tests may launch http requests through JSON or AJAX
104 // which causes a security error (cross domain request) when the page 98 // which causes a security error (cross domain request) when the page
105 // is loaded from the local file system ( file:// ). The following switch 99 // is loaded from the local file system ( file:// ). The following switch
106 // fixes that error. 100 // fixes that error.
107 launch_arguments_.AppendSwitch(switches::kAllowFileAccessFromFiles); 101 launch_arguments_.AppendSwitch(switches::kAllowFileAccessFromFiles);
108 102
109 if (!HasFlag(kUseGpu)) { 103 if (!HasFlag(kUseGpu)) {
110 launch_arguments_.AppendSwitch(switches::kDisableAcceleratedCompositing); 104 launch_arguments_.AppendSwitch(switches::kDisableAcceleratedCompositing);
111 launch_arguments_.AppendSwitch(switches::kDisableExperimentalWebGL); 105 launch_arguments_.AppendSwitch(switches::kDisableExperimentalWebGL);
112 launch_arguments_.AppendSwitch(switches::kDisableAccelerated2dCanvas); 106 launch_arguments_.AppendSwitch(switches::kDisableAccelerated2dCanvas);
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync, 313 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync,
320 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, 314 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
321 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | 315 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu |
322 kDisableVsync)); 316 kDisableVsync));
323 317
324 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies) 318 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
325 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE) 319 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
326 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading) 320 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
327 321
328 } // namespace 322 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698