| 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 1af24875bab73dd4344c31c6eb54fde6ab3133dd..7bcd3aa1696cd259b95c2854f1ed92e224bcf046 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -126,7 +126,6 @@ class RenderWidgetHostViewAura
|
| bool has_horizontal_scrollbar) OVERRIDE;
|
| virtual void SetScrollOffsetPinning(
|
| bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
|
| - virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
|
| virtual bool LockMouse() OVERRIDE;
|
| virtual void UnlockMouse() OVERRIDE;
|
|
|
| @@ -338,6 +337,19 @@ class RenderWidgetHostViewAura
|
| // This lock is for waiting for a front surface to become available to draw.
|
| scoped_refptr<aura::CompositorLock> released_front_lock_;
|
|
|
| + class CompositingDelegateAura : public CompositingDelegate {
|
| + public:
|
| + virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
|
| + virtual bool ResizeNeedsNewSurface() OVERRIDE;
|
| +
|
| + private:
|
| + friend class RenderWidgetHostViewAura;
|
| + CompositingDelegateAura(RenderWidgetHostViewAura* view)
|
| + : view_(view)
|
| + {}
|
| + RenderWidgetHostViewAura* view_;
|
| + };
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
|
| };
|
|
|
|
|