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

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: rebased Created 7 years, 7 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
« no previous file with comments | « content/renderer/gpu/input_handler_wrapper.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c66ab7cd82ea9e71e8c300eeb4777840b0f76edd..8852705567d83072156b5f1a838a9e0f5843abf8 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;
struct LatencyInfo;
}
@@ -32,6 +34,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);
@@ -92,8 +95,6 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
float page_scale) OVERRIDE;
virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface() OVERRIDE;
virtual void DidInitializeOutputSurface(bool success) OVERRIDE;
- virtual scoped_ptr<cc::InputHandlerClient> CreateInputHandlerClient()
- OVERRIDE;
virtual void WillCommit() OVERRIDE;
virtual void DidCommit() OVERRIDE;
virtual void DidCommitAndDrawFrame() OVERRIDE;
@@ -104,7 +105,7 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
virtual scoped_refptr<cc::ContextProvider>
OffscreenContextProviderForCompositorThread() OVERRIDE;
-private:
+ private:
explicit RenderWidgetCompositor(RenderWidget* widget);
bool initialize(cc::LayerTreeSettings settings);
« no previous file with comments | « content/renderer/gpu/input_handler_wrapper.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698