| OLD | NEW |
| 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/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 return suffix; | 40 return suffix; |
| 41 } | 41 } |
| 42 | 42 |
| 43 class FrameRateTest | 43 class FrameRateTest |
| 44 : public UIPerfTest | 44 : public UIPerfTest |
| 45 , public ::testing::WithParamInterface<int> { | 45 , public ::testing::WithParamInterface<int> { |
| 46 public: | 46 public: |
| 47 FrameRateTest() { | 47 FrameRateTest() { |
| 48 show_window_ = true; | 48 show_window_ = true; |
| 49 dom_automation_enabled_ = true; | 49 dom_automation_enabled_ = true; |
| 50 // Since this is a performance test, try to use the host machine's GPU | |
| 51 // instead of falling back to software-rendering. | |
| 52 force_use_osmesa_ = false; | |
| 53 disable_accelerated_compositing_ = false; | |
| 54 } | 50 } |
| 55 | 51 |
| 56 virtual FilePath GetDataPath(const std::string& name) { | 52 virtual FilePath GetDataPath(const std::string& name) { |
| 57 // Make sure the test data is checked out. | 53 // Make sure the test data is checked out. |
| 58 FilePath test_path; | 54 FilePath test_path; |
| 59 PathService::Get(chrome::DIR_TEST_DATA, &test_path); | 55 PathService::Get(chrome::DIR_TEST_DATA, &test_path); |
| 60 test_path = test_path.Append(FILE_PATH_LITERAL("perf")); | 56 test_path = test_path.Append(FILE_PATH_LITERAL("perf")); |
| 61 test_path = test_path.Append(FILE_PATH_LITERAL("frame_rate")); | 57 test_path = test_path.Append(FILE_PATH_LITERAL("frame_rate")); |
| 62 if (GetParam() & kInternal) { | 58 if (GetParam() & kInternal) { |
| 63 test_path = test_path.Append(FILE_PATH_LITERAL("private")); | 59 test_path = test_path.Append(FILE_PATH_LITERAL("private")); |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 kInternal, | 197 kInternal, |
| 202 kInternal | kDisableVsync, | 198 kInternal | kDisableVsync, |
| 203 kInternal | kDisableGpu, | 199 kInternal | kDisableGpu, |
| 204 kInternal | kUseReferenceBuild, | 200 kInternal | kUseReferenceBuild, |
| 205 kInternal | kDisableVsync | kUseReferenceBuild)); | 201 kInternal | kDisableVsync | kUseReferenceBuild)); |
| 206 | 202 |
| 207 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl) | 203 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl) |
| 208 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(speedreading) | 204 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(speedreading) |
| 209 | 205 |
| 210 } // namespace | 206 } // namespace |
| OLD | NEW |