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

Unified Diff: ui/gfx/compositor/test_compositor.cc

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/test_compositor.cc
diff --git a/ui/gfx/compositor/test_compositor.cc b/ui/gfx/compositor/test_compositor.cc
index f34021e50710170830e005bbbd72aadaf0bf05de..4bc6faa9a2f4a43dfb5fd7e18f47c09bbd52e641 100644
--- a/ui/gfx/compositor/test_compositor.cc
+++ b/ui/gfx/compositor/test_compositor.cc
@@ -19,9 +19,11 @@ class TestCompositorDelegate : public ui::CompositorDelegate {
DISALLOW_COPY_AND_ASSIGN(TestCompositorDelegate);
};
-TestCompositor::TestCompositor()
- : Compositor(new TestCompositorDelegate, gfx::Size(100, 100)) {
- owned_delegate_.reset(static_cast<TestCompositorDelegate*>(delegate()));
+TestCompositor::TestCompositor(CompositorDelegate *owner)
+ : Compositor((owner ? owner : new TestCompositorDelegate),
+ gfx::Size(100, 100)) {
+ if (!owner)
+ owned_delegate_.reset(static_cast<TestCompositorDelegate*>(delegate()));
}
TestCompositor::~TestCompositor() {
@@ -46,6 +48,10 @@ void TestCompositor::DrawTree() {
#endif
}
+ui::Compositor* TestCompositor::Create(ui::CompositorDelegate* owner) {
+ return new ui::TestCompositor(owner);
+}
+
void TestCompositor::OnWidgetSizeChanged() {
}

Powered by Google App Engine
This is Rietveld 408576698