summaryrefslogtreecommitdiffstats
path: root/ui/snapshot
diff options
context:
space:
mode:
authorweiliangc <weiliangc@chromium.org>2014-12-04 17:54:13 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-05 01:54:42 +0000
commitb821b71ff0166e250ae4b30b56c1b7b6d3bd5db6 (patch)
tree6cda55c677deb4faa679d0ebb88c5f0601113a1c /ui/snapshot
parentf291de7eecd98906f061afac01c5a474d48a9ac5 (diff)
downloadchromium_src-b821b71ff0166e250ae4b30b56c1b7b6d3bd5db6.zip
chromium_src-b821b71ff0166e250ae4b30b56c1b7b6d3bd5db6.tar.gz
chromium_src-b821b71ff0166e250ae4b30b56c1b7b6d3bd5db6.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 Committed: https://crrev.com/36b7fc7f8b05ea627873e58a162c1c26784e472d Cr-Commit-Position: refs/heads/master@{#298779} Review URL: https://codereview.chromium.org/638653003 Cr-Commit-Position: refs/heads/master@{#306954}
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 02c1350..500e40b 100644
--- a/ui/snapshot/snapshot_aura_unittest.cc
+++ b/ui/snapshot/snapshot_aura_unittest.cc
@@ -114,7 +114,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) {