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

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

Issue 9802006: Implement active wheel fling transfer via WebCompositorInputHandlerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years, 9 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 | « no previous file | content/renderer/gpu/compositor_thread.cc » ('j') | content/renderer/gpu/compositor_thread.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/compositor_thread.h
diff --git a/content/renderer/gpu/compositor_thread.h b/content/renderer/gpu/compositor_thread.h
index ea506d15c31e60675061e86bbbaf683978ff9cfb..aed3afd51249b1a02061e8d8d239d2f31b2640da 100644
--- a/content/renderer/gpu/compositor_thread.h
+++ b/content/renderer/gpu/compositor_thread.h
@@ -7,7 +7,9 @@
#include <map>
-#include "base/memory/linked_ptr.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "content/renderer/render_view_impl.h"
#include "ipc/ipc_channel_proxy.h"
#include "webkit/glue/webthread_impl.h"
@@ -31,8 +33,10 @@ class CompositorThread {
// to the compositor's thread.
IPC::ChannelProxy::MessageFilter* GetMessageFilter() const;
- // Callable from the main thread or the compositor's thread.
- void AddInputHandler(int routing_id, int input_handler_id);
+ // Callable from the main thread only.
+ void AddInputHandler(int routing_id,
+ int input_handler_id,
+ const base::WeakPtr<RenderViewImpl>& render_view_impl);
webkit_glue::WebThreadImpl* GetWebThread() { return &thread_; }
@@ -44,11 +48,18 @@ class CompositorThread {
void HandleInputEvent(int routing_id,
const WebKit::WebInputEvent* input_event);
+ // Called from the compositor's thread.
+ void AddInputHandlerOnCompositorThread(
+ int routing_id,
+ int input_handler_id,
+ scoped_refptr<base::MessageLoopProxy> main_loop,
+ const base::WeakPtr<RenderViewImpl>& render_view_impl);
+
class InputHandlerWrapper;
friend class InputHandlerWrapper;
typedef std::map<int, // routing_id
- linked_ptr<InputHandlerWrapper> > InputHandlerMap;
+ scoped_refptr<InputHandlerWrapper> > InputHandlerMap;
InputHandlerMap input_handlers_;
webkit_glue::WebThreadImpl thread_;
« no previous file with comments | « no previous file | content/renderer/gpu/compositor_thread.cc » ('j') | content/renderer/gpu/compositor_thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698