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

Unified Diff: ui/compositor/test/test_compositor_host_mac.mm

Issue 147033003: Move some non-unittest files to compositor_test_support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac compile Created 6 years, 11 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/compositor.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/test_compositor_host_mac.mm
diff --git a/ui/compositor/test/test_compositor_host_mac.mm b/ui/compositor/test/test_compositor_host_mac.mm
index 782f92ae5de208a691af8e953075a6c7653cde5e..5ccfb02b197fac2f70db0d7a045354130dcb9882 100644
--- a/ui/compositor/test/test_compositor_host_mac.mm
+++ b/ui/compositor/test/test_compositor_host_mac.mm
@@ -78,7 +78,7 @@ class AppKitHost : public FoundationHost {
// TestCompositorHostMac provides a window surface and a coordinated compositor
// for use in the compositor unit tests.
-class TestCompositorHostMac : public TestCompositorHost
+class TestCompositorHostMac : public TestCompositorHost,
public AppKitHost {
public:
TestCompositorHostMac(const gfx::Rect& bounds);
@@ -124,7 +124,8 @@ void TestCompositorHostMac::Show() {
defer:NO];
base::scoped_nsobject<AcceleratedTestView> view(
[[AcceleratedTestView alloc] init]);
- compositor_.reset(new ui::Compositor(view, bounds_.size()));
+ compositor_.reset(new ui::Compositor(view));
+ compositor_->SetScaleAndSize(1.0f, bounds_.size());
[view setCompositor:compositor_.get()];
[window_ setContentView:view];
[window_ orderFront:nil];
« no previous file with comments | « ui/compositor/compositor.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698