| 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> |
| 11 #import <Foundation/NSAutoreleasePool.h> | 11 #import <Foundation/NSAutoreleasePool.h> |
| 12 | 12 |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/mac/scoped_nsobject.h" | 14 #include "base/mac/scoped_nsobject.h" |
| 15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/thread_task_runner_handle.h" | 16 #include "base/thread_task_runner_handle.h" |
| 17 #include "ui/compositor/compositor.h" | 17 #include "ui/compositor/compositor.h" |
| 18 #include "ui/gfx/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
| 19 | 19 |
| 20 // AcceleratedTestView provides an NSView class that delegates drawing to a | 20 // AcceleratedTestView provides an NSView class that delegates drawing to a |
| 21 // ui::Compositor delegate, setting up the NSOpenGLContext as required. | 21 // ui::Compositor delegate, setting up the NSOpenGLContext as required. |
| 22 @interface AcceleratedTestView : NSView { | 22 @interface AcceleratedTestView : NSView { |
| 23 ui::Compositor* compositor_; | 23 ui::Compositor* compositor_; |
| 24 } | 24 } |
| 25 // Designated initializer. | 25 // Designated initializer. |
| 26 -(id)init; | 26 -(id)init; |
| 27 -(void)setCompositor:(ui::Compositor*)compositor; | 27 -(void)setCompositor:(ui::Compositor*)compositor; |
| 28 @end | 28 @end |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 } | 144 } |
| 145 | 145 |
| 146 // static | 146 // static |
| 147 TestCompositorHost* TestCompositorHost::Create( | 147 TestCompositorHost* TestCompositorHost::Create( |
| 148 const gfx::Rect& bounds, | 148 const gfx::Rect& bounds, |
| 149 ui::ContextFactory* context_factory) { | 149 ui::ContextFactory* context_factory) { |
| 150 return new TestCompositorHostMac(bounds, context_factory); | 150 return new TestCompositorHostMac(bounds, context_factory); |
| 151 } | 151 } |
| 152 | 152 |
| 153 } // namespace ui | 153 } // namespace ui |
| OLD | NEW |