summaryrefslogtreecommitdiffstats
path: root/ui/snapshot
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-28 05:35:54 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-28 05:35:54 +0000
commit1120afabccebfc07f6d6990b2696508f4a2f5ccc (patch)
tree87c7bb2c6aa8d53a763b2a0e4784c35197de8a3d /ui/snapshot
parentccf251570a3e16fa1cebc24ac8f8a3a3f05aabd1 (diff)
downloadchromium_src-1120afabccebfc07f6d6990b2696508f4a2f5ccc.zip
chromium_src-1120afabccebfc07f6d6990b2696508f4a2f5ccc.tar.gz
chromium_src-1120afabccebfc07f6d6990b2696508f4a2f5ccc.tar.bz2
Make SingleThreadProxy a SchedulerClient
This makes ui::Compositor no longer in charge of scheduling commits and draws, deferring it to cc::Scheduler. BUG=329552, 287250 Review URL: https://codereview.chromium.org/134623005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280493 0039d316-1c4b-4281-b951-d872f2087c98
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) {