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

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

Issue 8536008: Use only the steady gesture in frame rate tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 test_path = test_path.Append(FILE_PATH_LITERAL("content")); 77 test_path = test_path.Append(FILE_PATH_LITERAL("content"));
78 } 78 }
79 test_path = test_path.AppendASCII(name); 79 test_path = test_path.AppendASCII(name);
80 return test_path; 80 return test_path;
81 } 81 }
82 82
83 virtual void SetUp() { 83 virtual void SetUp() {
84 if (HasFlag(kUseReferenceBuild)) 84 if (HasFlag(kUseReferenceBuild))
85 UseReferenceBuild(); 85 UseReferenceBuild();
86 86
87 // Turn on chrome.Interval to get higher-resolution timestamps on frames.
88 launch_arguments_.AppendSwitch(switches::kEnableBenchmarking);
89
87 // UI tests boot up render views starting from about:blank. This causes 90 // UI tests boot up render views starting from about:blank. This causes
88 // the renderer to start up thinking it cannot use the GPU. To work 91 // the renderer to start up thinking it cannot use the GPU. To work
89 // around that, and allow the frame rate test to use the GPU, we must 92 // around that, and allow the frame rate test to use the GPU, we must
90 // pass kAllowWebUICompositing. 93 // pass kAllowWebUICompositing.
91 launch_arguments_.AppendSwitch(switches::kAllowWebUICompositing); 94 launch_arguments_.AppendSwitch(switches::kAllowWebUICompositing);
92 95
93 // Some of the tests may launch http requests through JSON or AJAX 96 // Some of the tests may launch http requests through JSON or AJAX
94 // which causes a security error (cross domain request) when the page 97 // which causes a security error (cross domain request) when the page
95 // is loaded from the local file system ( file:// ). The following switch 98 // is loaded from the local file system ( file:// ). The following switch
96 // fixes that error. 99 // fixes that error.
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 kInternal | kHasRedirect | kUseGpu, 285 kInternal | kHasRedirect | kUseGpu,
283 kInternal | kHasRedirect | kUseGpu | kDisableVsync, 286 kInternal | kHasRedirect | kUseGpu | kDisableVsync,
284 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, 287 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
285 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync)); 288 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync));
286 289
287 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies) 290 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
288 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE) 291 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
289 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading) 292 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
290 293
291 } // namespace 294 } // namespace
OLDNEW
« chrome/test/data/perf/frame_rate/head.js ('K') | « chrome/test/data/perf/frame_rate/head.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698