Index: content/browser/compositor/browser_compositor_ca_layer_tree_mac.h |
diff --git a/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h b/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h |
index 4092370f702d0a0e2fdb242f41e530da743a3f2d..eb293cd4ee5b41bb62bde8f693f5b97bfb735a1e 100644 |
--- a/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h |
+++ b/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h |
@@ -5,6 +5,7 @@ |
#ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_CA_LAYER_TREE_MAC_H_ |
#define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_CA_LAYER_TREE_MAC_H_ |
+#include <Cocoa/Cocoa.h> |
#include <IOSurface/IOSurfaceAPI.h> |
#include "base/mac/scoped_nsobject.h" |
@@ -26,8 +27,8 @@ class BrowserCompositorCALayerTreeMac |
static BrowserCompositorCALayerTreeMac* FromAcceleratedWidget( |
gfx::AcceleratedWidget widget); |
- void SetClient(BrowserCompositorViewMacClient* client); |
- void ResetClient(); |
+ void SetView(BrowserCompositorViewMac* view); |
+ void ResetView(); |
ui::Compositor* compositor() const { return compositor_.get(); } |
@@ -75,9 +76,8 @@ private: |
base::scoped_nsobject<IOSurfaceLayer> io_surface_layer); |
void DestroySoftwareLayer(); |
- // The client of the BrowserCompositorViewMac that is using this as its |
- // internals. |
- BrowserCompositorViewMacClient* client_; |
+ // The BrowserCompositorViewMac that is using this as its internals. |
+ BrowserCompositorViewMac* view_; |
// A phony NSView handle used to identify this. |
gfx::AcceleratedWidget native_widget_; |
@@ -113,6 +113,17 @@ private: |
gfx::Size last_swap_size_dip_; |
}; |
+void BrowserCompositorCALayerTreeMacGotAcceleratedFrame( |
+ gfx::AcceleratedWidget widget, |
+ uint64 surface_handle, int surface_id, |
+ const std::vector<ui::LatencyInfo>& latency_info, |
+ gfx::Size pixel_size, float scale_factor, |
+ bool* disable_throttling, int* renderer_id); |
+ |
+void BrowserCompositorCALayerTreeMacGotSoftwareFrame( |
+ gfx::AcceleratedWidget widget, |
+ cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas); |
+ |
} // namespace content |
#endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_CA_LAYER_TREE_MAC_H_ |