Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 10052018: Drop frontbuffers with ui-use-gpu-process, synchronized with browser, decoupled from backbuffer dro… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing nits Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6fa45d00563e7a55ad3dc052a7f1c18393abbcbe..7f9ee95d754da2744896f5d61a7900bb5ac7cbf2 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"
@@ -52,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();
@@ -118,7 +120,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;
@@ -228,6 +231,12 @@ class RenderWidgetHostViewAura
// Called when window_ is removed from the window tree.
void RemovingFromRootWindow();
+ void SetSurfaceNotInUseByCompositor();
sky 2012/06/13 16:21:23 Add descriptions for these.
mmocny 2012/06/13 18:40:05 Done.
+ void AdjustSurfaceProtection();
+
+ void CopyFromCompositingSurfaceFinished(base::Callback<void(bool)> callback,
+ bool result);
+
ui::Compositor* GetCompositor();
// Detaches |this| from the input method object.
@@ -289,6 +298,20 @@ class RenderWidgetHostViewAura
uint64 current_surface_;
+ // Protected means that the current_surface_ may be in use by ui and cannot
sky 2012/06/13 16:21:23 Use |s around argument names and field names in do
mmocny 2012/06/13 18:40:05 Done.
+ // be safely discarded. Things to consider are thumbnailer, compositor draw
+ // 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 surface_is_protected changes.
+ // Keeps gpu/browser IPC messages relying on protection state in sync.
+ uint32 protection_state_id_;
+
+ int32 surface_route_id_;
+
gfx::GLSurfaceHandle shared_surface_handle_;
// If non-NULL we're in OnPaint() and this is the supplied canvas.

Powered by Google App Engine
This is Rietveld 408576698