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

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

Issue 12356002: [NOT FOR COMMIT] Hacks to merge render compositor thread with UI thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: content/renderer/gpu/compositor_thread.h
diff --git a/content/renderer/gpu/compositor_thread.h b/content/renderer/gpu/compositor_thread.h
index e0bc9f319a6a0e3bb286be919e8163feb9496e06..2c4f833a5e68d131c49e55716d5aca42359da3bf 100644
--- a/content/renderer/gpu/compositor_thread.h
+++ b/content/renderer/gpu/compositor_thread.h
@@ -28,7 +28,8 @@ class CompositorThread {
public:
// |main_listener| refers to the central IPC message listener that lives on
// the main thread, where all incoming IPC messages are first handled.
- explicit CompositorThread(IPC::Listener* main_listener);
+ explicit CompositorThread(IPC::Listener* main_listener,
+ MessageLoop* message_loop);
~CompositorThread();
// This MessageFilter should be added to allow input events to be redirected
@@ -40,9 +41,9 @@ class CompositorThread {
int input_handler_id,
const base::WeakPtr<RenderViewImpl>& render_view_impl);
- webkit_glue::WebThreadImpl* GetWebThread() { return &thread_; }
+ webkit_glue::WebThreadImplForMessageLoop* GetWebThread() { return &thread_; }
- MessageLoop* message_loop() { return thread_.message_loop(); }
+ MessageLoop* message_loop() { return message_loop_; }
private:
// Callback only from the compositor's thread.
@@ -66,7 +67,8 @@ class CompositorThread {
scoped_refptr<InputHandlerWrapper> > InputHandlerMap;
InputHandlerMap input_handlers_;
- webkit_glue::WebThreadImpl thread_;
+ MessageLoop* message_loop_;
+ webkit_glue::WebThreadImplForMessageLoop thread_;
scoped_refptr<InputEventFilter> filter_;
};

Powered by Google App Engine
This is Rietveld 408576698