| Index: content/browser/compositor/browser_compositor_view_mac.h
|
| diff --git a/content/browser/compositor/browser_compositor_view_mac.h b/content/browser/compositor/browser_compositor_view_mac.h
|
| index 60ab7764976ca3c6e5db09f2f1d721d927bea812..7d942b0ca73db7c5a70b18f1b154eb3b531adc70 100644
|
| --- a/content/browser/compositor/browser_compositor_view_mac.h
|
| +++ b/content/browser/compositor/browser_compositor_view_mac.h
|
| @@ -22,6 +22,7 @@ class BrowserCompositorViewMacHelper;
|
| // Additions to the NSView interface for compositor frames.
|
| @interface NSView (BrowserCompositorView)
|
| - (void)gotAcceleratedIOSurfaceFrame:(uint64)surface_handle
|
| + withOutputSurfaceID:(int)surface_id
|
| withPixelSize:(gfx::Size)pixel_size
|
| withScaleFactor:(float)scale_factor;
|
|
|
| @@ -39,6 +40,7 @@ class BrowserCompositorViewMacHelper;
|
|
|
| base::scoped_nsobject<CALayer> background_layer_;
|
| base::scoped_nsobject<CompositingIOSurfaceLayer> accelerated_layer_;
|
| + int accelerated_layer_output_surface_id_;
|
| base::scoped_nsobject<SoftwareLayer> software_layer_;
|
|
|
| scoped_ptr<content::BrowserCompositorViewMacHelper> helper_;
|
|
|