diff options
| author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-27 09:29:18 +0000 |
|---|---|---|
| committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-27 09:29:18 +0000 |
| commit | 4341b773b755cf7b4914846c8dd567ece7624443 (patch) | |
| tree | 5111ecb33aa9fbf7b0aa79e197e9e4aa75ddd51d /cc | |
| parent | f1fae92d4b1b5f53cb3014c85f6f7a806a91aa8f (diff) | |
| download | chromium_src-4341b773b755cf7b4914846c8dd567ece7624443.zip chromium_src-4341b773b755cf7b4914846c8dd567ece7624443.tar.gz chromium_src-4341b773b755cf7b4914846c8dd567ece7624443.tar.bz2 | |
Revert 231092 "cc: Enable deadline scheduler by default for unit..."
cc_unitests started flaking often soon after this change.
Another suspected change is r231089, which landed around
the same time.
The failing test is:
LayerTreeHostContextTestCompositeAndReadbackBeforeOutputSurfaceInit.RunMultiThread_DirectRenderer_MainThreadPaint
> cc: Enable deadline scheduler by default for unit tests
>
> BUG=310591
>
> Review URL: https://codereview.chromium.org/43483003
TBR=brianderson@chromium.org
Review URL: https://codereview.chromium.org/45783004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/scheduler/scheduler_settings.cc | 2 | ||||
| -rw-r--r-- | cc/trees/layer_tree_settings.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cc/scheduler/scheduler_settings.cc b/cc/scheduler/scheduler_settings.cc index 9b8032c..6c1db6b 100644 --- a/cc/scheduler/scheduler_settings.cc +++ b/cc/scheduler/scheduler_settings.cc @@ -7,7 +7,7 @@ namespace cc { SchedulerSettings::SchedulerSettings() - : deadline_scheduling_enabled(true), + : deadline_scheduling_enabled(false), impl_side_painting(false), timeout_and_draw_when_animation_checkerboards(true), maximum_number_of_failed_draws_before_draw_is_forced_(3), diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc index eb0f2f3..b089a09 100644 --- a/cc/trees/layer_tree_settings.cc +++ b/cc/trees/layer_tree_settings.cc @@ -17,7 +17,7 @@ LayerTreeSettings::LayerTreeSettings() allow_antialiasing(true), throttle_frame_production(true), begin_impl_frame_scheduling_enabled(false), - deadline_scheduling_enabled(true), + deadline_scheduling_enabled(false), using_synchronous_renderer_compositor(false), per_tile_painting_enabled(false), partial_swap_enabled(false), |