diff options
| author | weiliangc <weiliangc@chromium.org> | 2014-10-09 10:10:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 17:10:51 +0000 |
| commit | 1f27b28c347712516bac2454bfece4beeb581568 (patch) | |
| tree | 30069f241cd12d5341afe00cf55f95e81cfdc067 /ui/snapshot | |
| parent | bca02c0bee7280463b7a2167dac022048ae44c73 (diff) | |
| download | chromium_src-1f27b28c347712516bac2454bfece4beeb581568.zip chromium_src-1f27b28c347712516bac2454bfece4beeb581568.tar.gz chromium_src-1f27b28c347712516bac2454bfece4beeb581568.tar.bz2 | |
Revert of Make ui::Compositor use ui::Scheduler (patchset #2 id:20001 of https://codereview.chromium.org/638653003/)
This reverts commit 36b7fc7f8b05ea627873e58a162c1c26784e472d.
Reason for revert:
Speculatively reverting as I suspect it may be the cause of test failures like this:
[16079:16079:1009/052004:FATAL:compositor.cc(303)] Check failed: !IsLocked().
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29%2832%29/builds/6451
Original issue's description:
> Make ui::Compositor use ui::Scheduler
>
> Taken from enne's CL 535733002 and rebased. It has been taken out of CL 134623005.
>
> BUG=329552
>
> Committed: https://crrev.com/36b7fc7f8b05ea627873e58a162c1c26784e472d
> Cr-Commit-Position: refs/heads/master@{#298779}
TBR=ben@chromium.org,danakj@chromium.org,sky@chromium.org,weiliangc@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=329552
Review URL: https://codereview.chromium.org/640293003
Cr-Commit-Position: refs/heads/master@{#298919}
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 c8e19d6..b5a2a66 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) { |