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

Unified Diff: content/renderer/gpu/render_widget_compositor.h

Issue 13844021: Move compositor thread input handling logic into content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win component build Created 7 years, 8 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/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);

Powered by Google App Engine
This is Rietveld 408576698