OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ |
6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ |
7 | 7 |
8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 #include <IOSurface/IOSurfaceAPI.h> |
9 | 10 |
10 #include "base/mac/scoped_nsobject.h" | 11 #include "base/mac/scoped_nsobject.h" |
11 #include "cc/output/software_frame_data.h" | 12 #include "cc/output/software_frame_data.h" |
12 #include "content/browser/renderer_host/compositing_iosurface_layer_mac.h" | 13 #include "content/browser/renderer_host/compositing_iosurface_layer_mac.h" |
13 #include "content/browser/renderer_host/software_layer_mac.h" | 14 #include "content/browser/renderer_host/software_layer_mac.h" |
14 #include "skia/ext/platform_canvas.h" | 15 #include "skia/ext/platform_canvas.h" |
15 #include "ui/compositor/compositor.h" | 16 #include "ui/compositor/compositor.h" |
16 #include "ui/gfx/geometry/size.h" | 17 #include "ui/gfx/geometry/size.h" |
17 | 18 |
18 namespace content { | 19 namespace content { |
19 class BrowserCompositorViewMacHelper; | 20 class BrowserCompositorViewMacHelper; |
20 } // namespace content | 21 } // namespace content |
21 | 22 |
22 // Additions to the NSView interface for compositor frames. | 23 // Additions to the NSView interface for compositor frames. |
23 @interface NSView (BrowserCompositorView) | 24 @interface NSView (BrowserCompositorView) |
24 - (void)gotAcceleratedIOSurfaceFrame:(uint64)surface_handle | 25 - (void)gotAcceleratedIOSurfaceFrame:(IOSurfaceID)surface_handle |
25 withOutputSurfaceID:(int)surface_id | 26 withOutputSurfaceID:(int)surface_id |
26 withPixelSize:(gfx::Size)pixel_size | 27 withPixelSize:(gfx::Size)pixel_size |
27 withScaleFactor:(float)scale_factor; | 28 withScaleFactor:(float)scale_factor; |
28 | 29 |
29 - (void)gotSoftwareFrame:(cc::SoftwareFrameData*)frame_data | 30 - (void)gotSoftwareFrame:(cc::SoftwareFrameData*)frame_data |
30 withScaleFactor:(float)scale_factor | 31 withScaleFactor:(float)scale_factor |
31 withCanvas:(SkCanvas*)canvas; | 32 withCanvas:(SkCanvas*)canvas; |
32 @end // NSView (BrowserCompositorView) | 33 @end // NSView (BrowserCompositorView) |
33 | 34 |
34 // NSView drawn by a ui::Compositor. The superview of this view is responsible | 35 // NSView drawn by a ui::Compositor. The superview of this view is responsible |
(...skipping 19 matching lines...) Expand all Loading... |
54 - (void)layoutLayers; | 55 - (void)layoutLayers; |
55 | 56 |
56 // Disallow further access to the client. | 57 // Disallow further access to the client. |
57 - (void)resetClient; | 58 - (void)resetClient; |
58 | 59 |
59 // Access the underlying ui::Compositor for this view. | 60 // Access the underlying ui::Compositor for this view. |
60 - (ui::Compositor*)compositor; | 61 - (ui::Compositor*)compositor; |
61 @end // BrowserCompositorViewMac | 62 @end // BrowserCompositorViewMac |
62 | 63 |
63 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ | 64 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ |
OLD | NEW |