diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-06 00:11:27 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-06 00:11:27 +0000 |
| commit | 44ed4bd710c9f7fa80be0413a460e99d366fecb2 (patch) | |
| tree | b1f6847657c891bb76c73258a469b11f70f73310 /ui/aura/root_window.cc | |
| parent | 582eca667aeb44a8be8cae16c4267029795b82dd (diff) | |
| download | chromium_src-44ed4bd710c9f7fa80be0413a460e99d366fecb2.zip chromium_src-44ed4bd710c9f7fa80be0413a460e99d366fecb2.tar.gz chromium_src-44ed4bd710c9f7fa80be0413a460e99d366fecb2.tar.bz2 | |
Aura: Make compositor_unittests work with --ui-enable-threaded-compositing
Check that a draw occured, rather than just that it was scheduled. Verify that CompositorDelegate is not called if compositing is threaded.
BUG=173417
TEST=compositor_unittests --ui-enable-threaded-compositing
Review URL: https://chromiumcodereview.appspot.com/13555004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window.cc')
| -rw-r--r-- | ui/aura/root_window.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index 8ae3b72..e706ef0 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -547,6 +547,7 @@ ui::EventTarget* RootWindow::GetParentTarget() { // RootWindow, ui::CompositorDelegate implementation: void RootWindow::ScheduleDraw() { + DCHECK(!ui::Compositor::WasInitializedWithThread()); if (!defer_draw_scheduling_) { defer_draw_scheduling_ = true; MessageLoop::current()->PostTask( |