| Index: content/browser/renderer_host/render_widget_host_view_mac.h
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_view_mac.h (revision 110386)
|
| +++ content/browser/renderer_host/render_widget_host_view_mac.h (working copy)
|
| @@ -265,7 +265,10 @@
|
| int32 height,
|
| TransportDIB::Handle transport_dib) OVERRIDE;
|
| virtual void AcceleratedSurfaceBuffersSwapped(
|
| - const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
|
| + gfx::PluginWindowHandle window,
|
| + uint64 surface_id,
|
| + int renderer_id,
|
| + int32 route_id,
|
| int gpu_host_id) OVERRIDE;
|
| virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
|
| virtual gfx::Rect GetRootWindowBounds() OVERRIDE;
|
|
|
| Property changes on: content\browser\renderer_host\render_widget_host_view_mac.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|