| 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_PRIVATE_MAC_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_PRIVATE_MAC_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_PRIVATE_MAC_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_PRIVATE_MAC_H_ |
| 7 | 7 |
| 8 #include "content/browser/compositor/browser_compositor_view_mac.h" | 8 #include "content/browser/compositor/browser_compositor_view_mac.h" |
| 9 | 9 |
| 10 @class BrowserCompositorViewCocoa; | 10 @class BrowserCompositorViewCocoa; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 int output_surface_id, | 50 int output_surface_id, |
| 51 const std::vector<ui::LatencyInfo>& latency_info, | 51 const std::vector<ui::LatencyInfo>& latency_info, |
| 52 gfx::Size pixel_size, | 52 gfx::Size pixel_size, |
| 53 float scale_factor) OVERRIDE; | 53 float scale_factor) OVERRIDE; |
| 54 virtual void GotSoftwareFrame( | 54 virtual void GotSoftwareFrame( |
| 55 cc::SoftwareFrameData* frame_data, | 55 cc::SoftwareFrameData* frame_data, |
| 56 float scale_factor, | 56 float scale_factor, |
| 57 SkCanvas* canvas) OVERRIDE; | 57 SkCanvas* canvas) OVERRIDE; |
| 58 | 58 |
| 59 // CompositingIOSurfaceLayerClient implementation: | 59 // CompositingIOSurfaceLayerClient implementation: |
| 60 virtual bool AcceleratedLayerShouldAckImmediately() const OVERRIDE; |
| 60 virtual void AcceleratedLayerDidDrawFrame(bool succeeded) OVERRIDE; | 61 virtual void AcceleratedLayerDidDrawFrame(bool succeeded) OVERRIDE; |
| 61 | 62 |
| 62 // The client of the BrowserCompositorViewMac that is using this as its | 63 // The client of the BrowserCompositorViewMac that is using this as its |
| 63 // internals. | 64 // internals. |
| 64 BrowserCompositorViewMacClient* client_; | 65 BrowserCompositorViewMacClient* client_; |
| 65 | 66 |
| 66 // The NSView drawn by the |compositor_| | 67 // The NSView drawn by the |compositor_| |
| 67 base::scoped_nsobject<BrowserCompositorViewCocoa> cocoa_view_; | 68 base::scoped_nsobject<BrowserCompositorViewCocoa> cocoa_view_; |
| 68 | 69 |
| 69 // The compositor drawing the contents of |cooca_view_|. Note that this must | 70 // The compositor drawing the contents of |cooca_view_|. Note that this must |
| (...skipping 27 matching lines...) Expand all Loading... |
| 97 } | 98 } |
| 98 | 99 |
| 99 - (id)initWithClient:(content::BrowserCompositorViewCocoaClient*)client; | 100 - (id)initWithClient:(content::BrowserCompositorViewCocoaClient*)client; |
| 100 | 101 |
| 101 // Mark that the client provided at initialization is no longer valid and may | 102 // Mark that the client provided at initialization is no longer valid and may |
| 102 // not be called back into. | 103 // not be called back into. |
| 103 - (void)resetClient; | 104 - (void)resetClient; |
| 104 @end | 105 @end |
| 105 | 106 |
| 106 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_PRIVATE_MAC_H_ | 107 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_PRIVATE_MAC_H_ |
| OLD | NEW |