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

Unified Diff: ui/compositor/test/test_compositor_host_win.cc

Issue 285373012: Temporarily adds another constructor to Compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak Created 6 years, 7 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
« no previous file with comments | « ui/compositor/test/test_compositor_host_ozone.cc ('k') | ui/compositor/test/test_compositor_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/test_compositor_host_win.cc
diff --git a/ui/compositor/test/test_compositor_host_win.cc b/ui/compositor/test/test_compositor_host_win.cc
index 4ea0df8fc0713654cf475840ec7769f43d423ce3..3f0e5dcaa73334f632f85129f332e8d5cad7b10a 100644
--- a/ui/compositor/test/test_compositor_host_win.cc
+++ b/ui/compositor/test/test_compositor_host_win.cc
@@ -14,9 +14,10 @@ namespace ui {
class TestCompositorHostWin : public TestCompositorHost,
public gfx::WindowImpl {
public:
- TestCompositorHostWin(const gfx::Rect& bounds) {
+ TestCompositorHostWin(const gfx::Rect& bounds,
+ ui::ContextFactory* context_factory) {
Init(NULL, bounds);
- compositor_.reset(new ui::Compositor(hwnd()));
+ compositor_.reset(new ui::Compositor(hwnd(), context_factory));
compositor_->SetScaleAndSize(1.0f, GetSize());
}
@@ -53,8 +54,10 @@ class TestCompositorHostWin : public TestCompositorHost,
DISALLOW_COPY_AND_ASSIGN(TestCompositorHostWin);
};
-TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
- return new TestCompositorHostWin(bounds);
+TestCompositorHost* TestCompositorHost::Create(
+ const gfx::Rect& bounds,
+ ui::ContextFactory* context_factory) {
+ return new TestCompositorHostWin(bounds, context_factory);
}
} // namespace ui
« no previous file with comments | « ui/compositor/test/test_compositor_host_ozone.cc ('k') | ui/compositor/test/test_compositor_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698