diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 05:50:49 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 05:50:49 +0000 |
| commit | 82f3d0b93dfffe25a62ed5afa2015c7d1bbea9ba (patch) | |
| tree | a92131d562ab031949d882a17d4ace288a6f4882 /ui/snapshot | |
| parent | 2cca802ed574e16a9042d35634cef5ead7385998 (diff) | |
| download | chromium_src-82f3d0b93dfffe25a62ed5afa2015c7d1bbea9ba.zip chromium_src-82f3d0b93dfffe25a62ed5afa2015c7d1bbea9ba.tar.gz chromium_src-82f3d0b93dfffe25a62ed5afa2015c7d1bbea9ba.tar.bz2 | |
Revert of Make SingleThreadProxy a SchedulerClient (https://codereview.chromium.org/134623005/)
Reason for revert:
Broke some layout tests
Original issue's description:
> 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
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287950
NOTRY=true
NOTREECHECKS=true
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/447133002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/snapshot')
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 018394b..5fe05a8 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -115,8 +115,7 @@ class SnapshotAuraTest : public testing::Test { void WaitForDraw() { helper_->host()->compositor()->ScheduleDraw(); - ui::DrawWaiterForTest::WaitForCompositingEnded( - helper_->host()->compositor()); + ui::DrawWaiterForTest::Wait(helper_->host()->compositor()); } void SetupTestWindow(const gfx::Rect& window_bounds) { |