summaryrefslogtreecommitdiffstats
path: root/ui/snapshot
diff options
context:
space:
mode:
authorweiliangc <weiliangc@chromium.org>2014-10-08 21:44:21 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-09 04:45:11 +0000
commit36b7fc7f8b05ea627873e58a162c1c26784e472d (patch)
treec8f7315374ec3fded78e1154a15f91a5ffeecb00 /ui/snapshot
parent7fd01193848852fb76c3d8324e58dc4086e6b463 (diff)
downloadchromium_src-36b7fc7f8b05ea627873e58a162c1c26784e472d.zip
chromium_src-36b7fc7f8b05ea627873e58a162c1c26784e472d.tar.gz
chromium_src-36b7fc7f8b05ea627873e58a162c1c26784e472d.tar.bz2
Make ui::Compositor use ui::Scheduler
Taken from enne's CL 535733002 and rebased. It has been taken out of CL 134623005. BUG=329552 Review URL: https://codereview.chromium.org/638653003 Cr-Commit-Position: refs/heads/master@{#298779}
Diffstat (limited to 'ui/snapshot')
-rw-r--r--ui/snapshot/snapshot_aura_unittest.cc3
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) {