Index: content/renderer/gpu/compositor_thread.h |
diff --git a/content/renderer/gpu/compositor_thread.h b/content/renderer/gpu/compositor_thread.h |
index 15843b8854d8145b081f80aefe729d4b32801b9e..b037f561aae96f0c3d30287b432b31a09ca73d5e 100644 |
--- a/content/renderer/gpu/compositor_thread.h |
+++ b/content/renderer/gpu/compositor_thread.h |
@@ -32,24 +32,24 @@ class CompositorThread { |
IPC::ChannelProxy::MessageFilter* GetMessageFilter() const; |
// Callable from the main thread or the compositor's thread. |
- void AddCompositor(int routing_id, int compositor_id); |
+ void AddInputHandler(int routing_id, int input_handler_id); |
webkit_glue::WebThreadImpl* GetWebThread() { return &thread_; } |
private: |
// Callback only from the compositor's thread. |
- void RemoveCompositor(int routing_id); |
+ void RemoveInputHandler(int routing_id); |
// Called from the compositor's thread. |
void HandleInputEvent(int routing_id, |
const WebKit::WebInputEvent* input_event); |
- class CompositorWrapper; |
- friend class CompositorWrapper; |
+ class InputHandlerWrapper; |
+ friend class InputHandlerWrapper; |
typedef std::map<int, // routing_id |
- linked_ptr<CompositorWrapper> > CompositorMap; |
- CompositorMap compositors_; |
+ linked_ptr<InputHandlerWrapper> > InputHandlerMap; |
+ InputHandlerMap input_handlers_; |
webkit_glue::WebThreadImpl thread_; |
scoped_refptr<InputEventFilter> filter_; |