| Index: content/renderer/gpu/render_widget_compositor.h
|
| diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
|
| index ecb9f57c410b7f00272bfde6f15010e63eaf1d71..da5641ca9a97e20d535780b485acb7469c377dda 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.h
|
| +++ b/content/renderer/gpu/render_widget_compositor.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
|
| #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
|
|
|
| +#include "base/memory/weak_ptr.h"
|
| #include "base/time.h"
|
| #include "cc/debug/rendering_stats.h"
|
| #include "cc/trees/layer_tree_host_client.h"
|
| @@ -16,6 +17,7 @@
|
| class SkPicture;
|
|
|
| namespace cc {
|
| +class InputHandler;
|
| class LayerTreeHost;
|
| }
|
|
|
| @@ -31,6 +33,7 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
|
|
|
| virtual ~RenderWidgetCompositor();
|
|
|
| + const base::WeakPtr<cc::InputHandler>& GetInputHandler();
|
| void SetSuppressScheduleComposite(bool suppress);
|
| void Animate(base::TimeTicks time);
|
| void Composite(base::TimeTicks frame_begin_time);
|
| @@ -89,8 +92,6 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
|
| float page_scale) OVERRIDE;
|
| virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface() OVERRIDE;
|
| virtual void DidRecreateOutputSurface(bool success) OVERRIDE;
|
| - virtual scoped_ptr<cc::InputHandlerClient> CreateInputHandlerClient()
|
| - OVERRIDE;
|
| virtual void WillCommit() OVERRIDE;
|
| virtual void DidCommit() OVERRIDE;
|
| virtual void DidCommitAndDrawFrame() OVERRIDE;
|
| @@ -101,7 +102,7 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
|
| virtual scoped_refptr<cc::ContextProvider>
|
| OffscreenContextProviderForCompositorThread() OVERRIDE;
|
|
|
| -private:
|
| + private:
|
| explicit RenderWidgetCompositor(RenderWidget* widget);
|
|
|
| bool initialize(cc::LayerTreeSettings settings);
|
|
|