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

Side by Side Diff: content/renderer/gpu/compositor_thread.h

Issue 9633014: Remove dead code left over from old-style WebCompositor initialization path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/renderer/gpu/compositor_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/linked_ptr.h" 10 #include "base/memory/linked_ptr.h"
(...skipping 14 matching lines...) Expand all
25 // |main_listener| refers to the central IPC message listener that lives on 25 // |main_listener| refers to the central IPC message listener that lives on
26 // the main thread, where all incoming IPC messages are first handled. 26 // the main thread, where all incoming IPC messages are first handled.
27 explicit CompositorThread(IPC::Channel::Listener* main_listener); 27 explicit CompositorThread(IPC::Channel::Listener* main_listener);
28 ~CompositorThread(); 28 ~CompositorThread();
29 29
30 // This MessageFilter should be added to allow input events to be redirected 30 // This MessageFilter should be added to allow input events to be redirected
31 // to the compositor's thread. 31 // to the compositor's thread.
32 IPC::ChannelProxy::MessageFilter* GetMessageFilter() const; 32 IPC::ChannelProxy::MessageFilter* GetMessageFilter() const;
33 33
34 // Callable from the main thread or the compositor's thread. 34 // Callable from the main thread or the compositor's thread.
35 void AddCompositor(int routing_id, int compositor_id); 35 void AddInputHandler(int routing_id, int input_handler_id);
36 36
37 webkit_glue::WebThreadImpl* GetWebThread() { return &thread_; } 37 webkit_glue::WebThreadImpl* GetWebThread() { return &thread_; }
38 38
39 private: 39 private:
40 // Callback only from the compositor's thread. 40 // Callback only from the compositor's thread.
41 void RemoveCompositor(int routing_id); 41 void RemoveInputHandler(int routing_id);
42 42
43 // Called from the compositor's thread. 43 // Called from the compositor's thread.
44 void HandleInputEvent(int routing_id, 44 void HandleInputEvent(int routing_id,
45 const WebKit::WebInputEvent* input_event); 45 const WebKit::WebInputEvent* input_event);
46 46
47 class CompositorWrapper; 47 class InputHandlerWrapper;
48 friend class CompositorWrapper; 48 friend class InputHandlerWrapper;
49 49
50 typedef std::map<int, // routing_id 50 typedef std::map<int, // routing_id
51 linked_ptr<CompositorWrapper> > CompositorMap; 51 linked_ptr<InputHandlerWrapper> > InputHandlerMap;
52 CompositorMap compositors_; 52 InputHandlerMap input_handlers_;
53 53
54 webkit_glue::WebThreadImpl thread_; 54 webkit_glue::WebThreadImpl thread_;
55 scoped_refptr<InputEventFilter> filter_; 55 scoped_refptr<InputEventFilter> filter_;
56 }; 56 };
57 57
58 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_ 58 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/gpu/compositor_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698