| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/compositor/test/test_compositor_host.h" | 5 #include "ui/compositor/test/test_compositor_host.h" |
| 6 | 6 |
| 7 #import <AppKit/NSApplication.h> | 7 #import <AppKit/NSApplication.h> |
| 8 #import <AppKit/NSOpenGL.h> | 8 #import <AppKit/NSOpenGL.h> |
| 9 #import <AppKit/NSView.h> | 9 #import <AppKit/NSView.h> |
| 10 #import <AppKit/NSWindow.h> | 10 #import <AppKit/NSWindow.h> |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 DCHECK(!window_); | 120 DCHECK(!window_); |
| 121 window_ = [[NSWindow alloc] | 121 window_ = [[NSWindow alloc] |
| 122 initWithContentRect:NSMakeRect(bounds_.x(), | 122 initWithContentRect:NSMakeRect(bounds_.x(), |
| 123 bounds_.y(), | 123 bounds_.y(), |
| 124 bounds_.width(), | 124 bounds_.width(), |
| 125 bounds_.height()) | 125 bounds_.height()) |
| 126 styleMask:NSBorderlessWindowMask | 126 styleMask:NSBorderlessWindowMask |
| 127 backing:NSBackingStoreBuffered | 127 backing:NSBackingStoreBuffered |
| 128 defer:NO]; | 128 defer:NO]; |
| 129 scoped_nsobject<AcceleratedTestView> view([[AcceleratedTestView alloc] init]); | 129 scoped_nsobject<AcceleratedTestView> view([[AcceleratedTestView alloc] init]); |
| 130 compositor_.reset(new ui::Compositor(this, view)); | 130 compositor_.reset(new ui::Compositor(this, view, bounds_.size())); |
| 131 compositor_->SetScaleAndSize(1.0f, bounds_.size()); | |
| 132 [view setCompositor:compositor_.get()]; | 131 [view setCompositor:compositor_.get()]; |
| 133 [window_ setContentView:view]; | 132 [window_ setContentView:view]; |
| 134 [window_ orderFront:nil]; | 133 [window_ orderFront:nil]; |
| 135 } | 134 } |
| 136 | 135 |
| 137 ui::Compositor* TestCompositorHostMac::GetCompositor() { | 136 ui::Compositor* TestCompositorHostMac::GetCompositor() { |
| 138 return compositor_.get(); | 137 return compositor_.get(); |
| 139 } | 138 } |
| 140 | 139 |
| 141 void TestCompositorHostMac::ScheduleDraw() { | 140 void TestCompositorHostMac::ScheduleDraw() { |
| 142 if (!compositor_.get()) | 141 if (!compositor_.get()) |
| 143 return; | 142 return; |
| 144 | 143 |
| 145 // Force display now. | 144 // Force display now. |
| 146 [window_ display]; | 145 [window_ display]; |
| 147 } | 146 } |
| 148 | 147 |
| 149 // static | 148 // static |
| 150 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) { | 149 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) { |
| 151 return new TestCompositorHostMac(bounds); | 150 return new TestCompositorHostMac(bounds); |
| 152 } | 151 } |
| 153 | 152 |
| 154 } // namespace ui | 153 } // namespace ui |
| OLD | NEW |