OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_ | 5 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_ |
6 #define CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_ | 6 #define CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 // the main thread, where all incoming IPC messages are first handled. | 28 // the main thread, where all incoming IPC messages are first handled. |
29 explicit CompositorThread(IPC::Channel::Listener* main_listener); | 29 explicit CompositorThread(IPC::Channel::Listener* main_listener); |
30 ~CompositorThread(); | 30 ~CompositorThread(); |
31 | 31 |
32 // This MessageFilter should be added to allow input events to be redirected | 32 // This MessageFilter should be added to allow input events to be redirected |
33 // to the compositor's thread. | 33 // to the compositor's thread. |
34 IPC::ChannelProxy::MessageFilter* GetMessageFilter() const; | 34 IPC::ChannelProxy::MessageFilter* GetMessageFilter() const; |
35 | 35 |
36 // Callable from the main thread only. | 36 // Callable from the main thread only. |
37 void AddInputHandler(int routing_id, | 37 void AddInputHandler(int routing_id, |
| 38 IPC::Message::Sender* sender, |
38 int input_handler_id, | 39 int input_handler_id, |
39 const base::WeakPtr<RenderViewImpl>& render_view_impl); | 40 const base::WeakPtr<RenderViewImpl>& render_view_impl); |
40 | 41 |
41 webkit_glue::WebThreadImpl* GetWebThread() { return &thread_; } | 42 webkit_glue::WebThreadImpl* GetWebThread() { return &thread_; } |
42 | 43 |
43 private: | 44 private: |
44 // Callback only from the compositor's thread. | 45 // Callback only from the compositor's thread. |
45 void RemoveInputHandler(int routing_id); | 46 void RemoveInputHandler(int routing_id); |
46 | 47 |
47 // Called from the compositor's thread. | 48 // Called from the compositor's thread. |
48 void HandleInputEvent(int routing_id, | 49 void HandleInputEvent(int routing_id, |
49 const WebKit::WebInputEvent* input_event); | 50 const WebKit::WebInputEvent* input_event); |
50 | 51 |
51 // Called from the compositor's thread. | 52 // Called from the compositor's thread. |
52 void AddInputHandlerOnCompositorThread( | 53 void AddInputHandlerOnCompositorThread( |
53 int routing_id, | 54 int routing_id, |
| 55 IPC::Message::Sender* sender, |
54 int input_handler_id, | 56 int input_handler_id, |
55 scoped_refptr<base::MessageLoopProxy> main_loop, | 57 scoped_refptr<base::MessageLoopProxy> main_loop, |
56 const base::WeakPtr<RenderViewImpl>& render_view_impl); | 58 const base::WeakPtr<RenderViewImpl>& render_view_impl); |
57 | 59 |
58 class InputHandlerWrapper; | 60 class InputHandlerWrapper; |
59 friend class InputHandlerWrapper; | 61 friend class InputHandlerWrapper; |
60 | 62 |
61 typedef std::map<int, // routing_id | 63 typedef std::map<int, // routing_id |
62 scoped_refptr<InputHandlerWrapper> > InputHandlerMap; | 64 scoped_refptr<InputHandlerWrapper> > InputHandlerMap; |
63 InputHandlerMap input_handlers_; | 65 InputHandlerMap input_handlers_; |
64 | 66 |
65 webkit_glue::WebThreadImpl thread_; | 67 webkit_glue::WebThreadImpl thread_; |
66 scoped_refptr<InputEventFilter> filter_; | 68 scoped_refptr<InputEventFilter> filter_; |
67 }; | 69 }; |
68 | 70 |
69 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_ | 71 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_ |
OLD | NEW |