Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: ui/gfx/compositor/compositor.h

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/compositor/compositor.h
diff --git a/ui/gfx/compositor/compositor.h b/ui/gfx/compositor/compositor.h
index 574fed88f87ce3475fa21732ef5c79a91b478556..4ec89da00283d7e34150bdd34601c6ba8b35b9ea 100644
--- a/ui/gfx/compositor/compositor.h
+++ b/ui/gfx/compositor/compositor.h
@@ -137,6 +137,16 @@ class COMPOSITOR_EXPORT Compositor : public base::RefCounted<Compositor> {
void RemoveObserver(CompositorObserver* observer);
bool HasObserver(CompositorObserver* observer);
+ static void set_compositor_factory_for_testing(
+ ui::Compositor*(*factory)(ui::CompositorDelegate* owner)) {
+ compositor_factory_ = factory;
+ }
+
+ static ui::Compositor* (*compositor_factory())(
+ ui::CompositorDelegate* owner) {
+ return compositor_factory_;
+ }
+
protected:
Compositor(CompositorDelegate* delegate, const gfx::Size& size);
virtual ~Compositor();
@@ -169,6 +179,12 @@ class COMPOSITOR_EXPORT Compositor : public base::RefCounted<Compositor> {
ObserverList<CompositorObserver> observer_list_;
+ // Factory used to create Compositors. Settable by tests.
+ // The delegate can be NULL if you don't wish to catch the ScheduleDraw()
+ // calls to it.
+ static ui::Compositor*(*compositor_factory_)(
+ ui::CompositorDelegate* delegate);
+
friend class base::RefCounted<Compositor>;
};

Powered by Google App Engine
This is Rietveld 408576698