diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 02:30:53 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 02:30:53 +0000 |
| commit | 4f4f3f6bdb8ac5461298923757970e071230c810 (patch) | |
| tree | 1dc264dbf4a8c8b6c70d5198c5adb3938f073e38 /chrome/test/ui/ui_test.h | |
| parent | c29240a21de2e855328792ae5b755c026cfc80eb (diff) | |
| download | chromium_src-4f4f3f6bdb8ac5461298923757970e071230c810.zip chromium_src-4f4f3f6bdb8ac5461298923757970e071230c810.tar.gz chromium_src-4f4f3f6bdb8ac5461298923757970e071230c810.tar.bz2 | |
Revert 105914 - Removed the ability to disable accelerated compositing for UI tests. There is no need to disable accelerated compositing on any platform. Mac bots are always accelerated. Mesa works fine on others.
BUG=95782
Broke Linux TSAN.
Review URL: http://codereview.chromium.org/7996010
TBR=alokp@chromium.org
Review URL: http://codereview.chromium.org/8330008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.h')
| -rw-r--r-- | chrome/test/ui/ui_test.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index a0f4ec6..6e4a4a2 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -356,6 +356,12 @@ class UITestBase { // PID file for websocket server. FilePath websocket_pid_file_; + // Whether to force use of mesa for GL rendering. + bool force_use_osmesa_; + + // Whether to disable accelerated compositing for this test. + bool disable_accelerated_compositing_; + private: // Time the test was started (so we can check for new crash dumps) base::Time test_start_time_; |