summaryrefslogtreecommitdiffstats
path: root/ui/compositor/compositor.h
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 10:13:51 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 10:13:51 +0000
commitb58081d570d7f04f49f4a5371a1e5a7273213aed (patch)
tree34aec2c59616dd9c157f4c679dc126082f507e48 /ui/compositor/compositor.h
parente73701940d76c67bbd2bd37764e1ddfc0aa9420a (diff)
downloadchromium_src-b58081d570d7f04f49f4a5371a1e5a7273213aed.zip
chromium_src-b58081d570d7f04f49f4a5371a1e5a7273213aed.tar.gz
chromium_src-b58081d570d7f04f49f4a5371a1e5a7273213aed.tar.bz2
ui: Move DrawWaiterForTest out of compositor.h/cc
Put this class in its own files in ui/compositor/test/. R=enne TBR=sky BUG= Review URL: https://codereview.chromium.org/138903017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor/compositor.h')
-rw-r--r--ui/compositor/compositor.h37
1 files changed, 0 insertions, 37 deletions
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 4beb9ff..c481dc9 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -160,43 +160,6 @@ class COMPOSITOR_EXPORT CompositorLock
DISALLOW_COPY_AND_ASSIGN(CompositorLock);
};
-// This is only to be used for test. It allows execution of other tasks on
-// the current message loop before the current task finishs (there is a
-// potential for re-entrancy).
-class COMPOSITOR_EXPORT DrawWaiterForTest : public CompositorObserver {
- public:
- // Waits for a draw to be issued by the compositor. If the test times out
- // here, there may be a logic error in the compositor code causing it
- // not to draw.
- static void Wait(Compositor* compositor);
-
- // Waits for a commit instead of a draw.
- static void WaitForCommit(Compositor* compositor);
-
- private:
- DrawWaiterForTest();
- virtual ~DrawWaiterForTest();
-
- void WaitImpl(Compositor* compositor);
-
- // CompositorObserver implementation.
- virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE;
- virtual void OnCompositingStarted(Compositor* compositor,
- base::TimeTicks start_time) OVERRIDE;
- virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE;
- virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE;
- virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE;
- virtual void OnUpdateVSyncParameters(Compositor* compositor,
- base::TimeTicks timebase,
- base::TimeDelta interval) OVERRIDE;
-
- scoped_ptr<base::RunLoop> wait_run_loop_;
-
- bool wait_for_commit_;
-
- DISALLOW_COPY_AND_ASSIGN(DrawWaiterForTest);
-};
-
// Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an