| 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 022236b9846c1b369cc54cff4a0da3ded09d47b3..b970f9f59c7a49782aa8689a1db049f9b2e15261 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/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "cc/compositor_frame.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"
|
| @@ -125,6 +126,8 @@ class RenderWidgetHostViewAura
|
| int32 height_in_pixel,
|
| uint64 surface_id) OVERRIDE;
|
| virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE;
|
| + virtual void SwapCompositorFrame(
|
| + const cc::CompositorFrame& frame) OVERRIDE;
|
| virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
|
| virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
|
| virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type,
|
| @@ -249,6 +252,8 @@ class RenderWidgetHostViewAura
|
| static void InsertSyncPointAndACK(int32 route_id,
|
| int gpu_host_id,
|
| ui::Compositor* compositor);
|
| + void SwapCompositorFrameAck(const cc::TransferableResourceList& resources, ui::Compositor*);
|
| + void SendSwapCompositorFrameAck(ui::Compositor*);
|
|
|
| // Called when window_ is removed from the window tree.
|
| void RemovingFromRootWindow();
|
|
|