Aura: Browser-side changes for Composite-To-Mailbox

content/browser/renderer_host/render_widget_host_view_aura.h

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 3f097b3810f2bd50133b743c3f126c1a08d9dee2..e6964f844e08fba47224f45b8974910ddc19d631 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -176,6 +176,9 @@ class RenderWidgetHostViewAura
           params) OVERRIDE;
   virtual bool LockMouse() OVERRIDE;
   virtual void UnlockMouse() OVERRIDE;
+  virtual void OnSwapCompositorFrame(const cc::CompositorFrame& frame,
+                                     int render_host_id,
+                                     int route_id) OVERRIDE;
 
   // Overridden from ui::TextInputClient:
   virtual void SetCompositionText(
@@ -318,20 +321,6 @@ class RenderWidgetHostViewAura
   // Run the compositing callbacks.
   void RunCompositingDidCommitCallbacks();
 
-  struct BufferPresentedParams {
-    BufferPresentedParams(int route_id,
-                          int gpu_host_id);
-    ~BufferPresentedParams();
-
-    int32 route_id;
-    int gpu_host_id;
-    scoped_refptr<ui::Texture> texture_to_produce;
-  };
-
-  // Insert a sync point into the compositor's command stream and acknowledge
-  // that we have presented the accelerated surface buffer.
-  static void InsertSyncPointAndACK(const BufferPresentedParams& params);
-
   // Called after |window_| is parented to a RootWindow.
   void AddedToRootWindow();
 
@@ -361,12 +350,22 @@ class RenderWidgetHostViewAura
   // Converts |rect| from window coordinate to screen coordinate.
   gfx::Rect ConvertRectToScreen(const gfx::Rect& rect);
 
+  typedef base::Callback<void(const scoped_refptr<ui::Texture>&)>
+      BufferPresentedCallback;
+
+  // The common entry point for full buffer updates from renderer
+  // and GPU process. Returns false if the frame is being skipped.
+  bool BuffersSwapped(const gfx::Size& size,
+                      const std::string& mailbox_name,
+                      const BufferPresentedCallback& ack_callback);
+
   bool SwapBuffersPrepare(const gfx::Rect& surface_rect,
                           const gfx::Rect& damage_rect,
-                          const std::string& mailbox_name,
-                          BufferPresentedParams* params);
+                          const std::string& mailbox_name);
 
-  void SwapBuffersCompleted(const BufferPresentedParams& params);
+  void SwapBuffersCompleted(
+      const BufferPresentedCallback& ack_callback,
+      const scoped_refptr<ui::Texture>& texture_to_return);
 
 #if defined(OS_WIN)
   // Sets the cutout rects from transient windows. These are rectangles that