Drop frontbuffers with ui-use-gpu-process, synchronized with browser, decoupled from backbuffer dro…

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 0cb5326d84f66ffe45aa2a42f18dc3ee9193ce8c..ffb8d12eacbb6d2466d2381550a39422ab46935f 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -12,6 +12,7 @@
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/image_transport_factory.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/content_export.h"
@@ -22,6 +23,10 @@
 #include "ui/gfx/rect.h"
 #include "webkit/glue/webcursor.h"
 
+namespace aura {
+class CompositorLock;
+}
+
 namespace content {
 class RenderWidgetHostImpl;
 class RenderWidgetHostView;
@@ -111,7 +116,9 @@ class RenderWidgetHostViewAura
       int32 width_in_pixel,
       int32 height_in_pixel,
       uint64* surface_id,
-      TransportDIB::Handle* surface_handle) OVERRIDE;
+      TransportDIB::Handle* surface_handle,
+      int32 route_id,
+      int gpu_host_id) OVERRIDE;
   virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE;
   virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
   virtual gfx::Rect GetRootWindowBounds() OVERRIDE;
@@ -221,6 +228,12 @@ class RenderWidgetHostViewAura
   // Called when window_ is removed from the window tree.
   void RemovingFromRootWindow();
 
+  void SendSurfaceIsProtectedBasedOnVisibilityWhenReady();
+  void SendSurfaceIsProtectedFalseAfterThumbnailerFinished();
+
+  void CopyFromCompositingSurfaceFinished(base::Callback<void(bool)> callback,
+                                          bool result);
+
   ui::Compositor* GetCompositor();
 
   // The model object.
@@ -276,6 +289,16 @@ class RenderWidgetHostViewAura
 
   uint64 current_surface_;
 
+  int32 route_id_;
+  int gpu_host_id_;
+
+  // Factory used to safely scope delayed calls.
+  base::WeakPtrFactory<RenderWidgetHostViewAura> weak_factory_;
+
+  bool is_thumbnailing_;
+
+  base::Callback<void(void)> on_thumbnailing_ended_callback_;
+
   gfx::GLSurfaceHandle shared_surface_handle_;
 
   // If non-NULL we're in OnPaint() and this is the supplied canvas.
@@ -308,6 +331,9 @@ class RenderWidgetHostViewAura
   // These locks are the ones waiting for a frame to be drawn.
   std::vector<linked_ptr<ResizeLock> > locks_pending_draw_;
 
+  // This lock is for waiting for a front surface to become available to draw.
+  scoped_refptr<aura::CompositorLock> released_front_lock_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };