diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 01:43:06 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 01:44:17 +0000 |
| commit | 174c6d466c98f31a8f1017241499a23038297f38 (patch) | |
| tree | 9c37260847c0bee1b94a462038ff7dc065324593 /ui/snapshot | |
| parent | f83ef232a24922c700fe63357ccddcb700a01c27 (diff) | |
| download | chromium_src-174c6d466c98f31a8f1017241499a23038297f38.zip chromium_src-174c6d466c98f31a8f1017241499a23038297f38.tar.gz chromium_src-174c6d466c98f31a8f1017241499a23038297f38.tar.bz2 | |
Make SingleThreadProxy a SchedulerClient
This makes ui::Compositor no longer in charge of
scheduling commits and draws, deferring it to cc::Scheduler.
Other compositors that use SingleThreadProxy are left calling composite
synchronously and now pass a flag to indicate that this is their
intention. This patch doesn't remove synchronous composite, but now
makes it mutually exclusive with scheduling.
BUG=329552, 287250
Review URL: https://codereview.chromium.org/134623005
Cr-Commit-Position: refs/heads/master@{#288866}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/snapshot')
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 5fe05a8..018394b 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -115,7 +115,8 @@ class SnapshotAuraTest : public testing::Test { void WaitForDraw() { helper_->host()->compositor()->ScheduleDraw(); - ui::DrawWaiterForTest::Wait(helper_->host()->compositor()); + ui::DrawWaiterForTest::WaitForCompositingEnded( + helper_->host()->compositor()); } void SetupTestWindow(const gfx::Rect& window_bounds) { |