diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 03:15:45 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 03:15:45 +0000 |
| commit | 5cd9ce11fc761bac948c125820d7c3aa2c9314bc (patch) | |
| tree | 0a09616ba8700887038a96bff5c8d0cc2580dd24 /ui/snapshot | |
| parent | 00cfda9fe13085a284a400f01900937302547e39 (diff) | |
| download | chromium_src-5cd9ce11fc761bac948c125820d7c3aa2c9314bc.zip chromium_src-5cd9ce11fc761bac948c125820d7c3aa2c9314bc.tar.gz chromium_src-5cd9ce11fc761bac948c125820d7c3aa2c9314bc.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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287950 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) { |