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..a4e27824c0afea2e5326933838116f1519365975 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;
@@ -48,7 +53,8 @@ class RenderWidgetHostViewAura
       public ui::TextInputClient,
       public aura::WindowDelegate,
       public aura::client::ActivationDelegate,
-      public ImageTransportFactoryObserver {
+      public ImageTransportFactoryObserver,
+      public base::SupportsWeakPtr<RenderWidgetHostViewAura> {
  public:
   virtual ~RenderWidgetHostViewAura();
 
@@ -111,7 +117,8 @@ 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) 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 SetSurfaceNotInUseByCompositor(uint32 expected_visibility_state_id);
+  void AdjustSurfaceProtection();
+
+  void CopyFromCompositingSurfaceFinished(base::Callback<void(bool)> callback,
+                                          bool result);
+
   ui::Compositor* GetCompositor();
 
   // The model object.
@@ -276,6 +289,20 @@ class RenderWidgetHostViewAura
 
   uint64 current_surface_;
 
+  // protected means that the current_surface_ may be in use by ui and cannot

[piman, 2012/06/12 20:59:48]

nit: Protected (cap 1st letter)

+  // be safely discarded. Things to consider are thumbnailerm compositor draw

[piman, 2012/06/12 20:59:48]

typo: thumbnailer,

+  // pending, and tab visibility.
+  bool current_surface_is_protected_;
+  bool current_surface_in_use_by_compositor_;
+
+  int pending_thumbnail_tasks_;
+
+  // This id increments every time visibility changes. Keeps gpu/browser IPC
+  // IPC messages relying on visibility state tagged and in sync.
+  uint32 visibility_state_id_;
+
+  int32 route_id_;

[piman, 2012/06/12 20:59:48]

nit: maybe rename this as "surface_route_id_" to make it clear this is the
routing id for the surface, not the view.

+
   gfx::GLSurfaceHandle shared_surface_handle_;
 
   // If non-NULL we're in OnPaint() and this is the supplied canvas.
@@ -308,6 +335,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);
 };