Index: content/browser/renderer_host/render_widget_host_view_aura.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h |
index 1af24875bab73dd4344c31c6eb54fde6ab3133dd..22e29bfa48905da2e3e1d6b1a17079505c345926 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.h |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h |
@@ -229,11 +229,13 @@ class RenderWidgetHostViewAura |
bool ShouldMoveToCenter(); |
// Run the compositing callbacks. |
- void RunCompositingCallbacks(); |
+ void RunCompositingCallbacks(ui::Compositor* compositor); |
// Insert a sync point into the compositor's command stream and acknowledge |
// that we have presented the accelerated surface buffer. |
- void InsertSyncPointAndACK(int32 route_id, int gpu_host_id); |
+ static void InsertSyncPointAndACK(int32 route_id, |
+ int gpu_host_id, |
+ ui::Compositor* compositor); |
// Called when window_ is removed from the window tree. |
void RemovingFromRootWindow(); |
@@ -295,7 +297,7 @@ class RenderWidgetHostViewAura |
// Current tooltip text. |
string16 tooltip_; |
- std::vector< base::Callback<void(void)> > |
+ std::vector< base::Callback<void(ui::Compositor*)> > |
on_compositing_will_start_callbacks_; |
std::map<uint64, scoped_refptr<ImageTransportClient> > |