diff options
| author | brianderson <brianderson@chromium.org> | 2015-07-15 12:52:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 19:53:22 +0000 |
| commit | 9bf7d5657eab1f1f57e9527fd2af9a8786e5d979 (patch) | |
| tree | 6a4325cbf7686d37881c025286524c87745e9c00 /cc/trees/layer_tree_host_unittest.cc | |
| parent | 081c3928d44498a3806b4d5bf9f05dec0f801bdf (diff) | |
| download | chromium_src-9bf7d5657eab1f1f57e9527fd2af9a8786e5d979.zip chromium_src-9bf7d5657eab1f1f57e9527fd2af9a8786e5d979.tar.gz chromium_src-9bf7d5657eab1f1f57e9527fd2af9a8786e5d979.tar.bz2 | |
cc: Initialize wait_for_beginframe_interval in tests.
Only setting disable_display_vsync isn't sufficient and
results in timeouts on Android perf bots.
BUG=510430
TBR=danakj
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1234463004
Cr-Commit-Position: refs/heads/master@{#338894}
Diffstat (limited to 'cc/trees/layer_tree_host_unittest.cc')
| -rw-r--r-- | cc/trees/layer_tree_host_unittest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index 6313eef..54c1e3d 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -1900,6 +1900,7 @@ class LayerTreeHostTestAbortedCommitDoesntStallDisabledVsync : public LayerTreeHostTestAbortedCommitDoesntStall { void InitializeSettings(LayerTreeSettings* settings) override { LayerTreeHostTestAbortedCommitDoesntStall::InitializeSettings(settings); + settings->wait_for_beginframe_interval = false; settings->renderer_settings.disable_display_vsync = true; } }; |