Implement WebCompositorOutputSurface

content/renderer/gpu/compositor_thread.h

Index: content/renderer/gpu/compositor_thread.h
diff --git a/content/renderer/gpu/compositor_thread.h b/content/renderer/gpu/compositor_thread.h
index ed38a37240382a0f9b4539e7cd36d032c90db848..ad445e39676c4fef8c81eb6ed57936ec763e0aea 100644
--- a/content/renderer/gpu/compositor_thread.h
+++ b/content/renderer/gpu/compositor_thread.h
@@ -11,6 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "content/renderer/render_view_impl.h"
 #include "ipc/ipc_channel_proxy.h"
+#include "ipc/ipc_forwarding_message_filter.h"
 #include "webkit/glue/webthread_impl.h"
 
 namespace WebKit {
@@ -31,12 +32,16 @@ class CompositorThread {
 
   // This MessageFilter should be added to allow input events to be redirected
   // to the compositor's thread.
-  IPC::ChannelProxy::MessageFilter* GetMessageFilter() const;
+  IPC::ChannelProxy::MessageFilter* GetInputFilter() const;
+
+  // This MessageFilter should be added to allow compositor events to be
+  // redirected /* to the compositor's thread. */
+  IPC::ChannelProxy::MessageFilter* GetCompositorFilter() const;
 
   // Callable from the main thread only.
-  void AddInputHandler(int routing_id,
-                       int input_handler_id,
-                       const base::WeakPtr<RenderViewImpl>& render_view_impl);
+  void AddHandlers(int routing_id,
+                   int input_handler_id,
+                   const base::WeakPtr<RenderViewImpl>& render_view_impl);
 
   webkit_glue::WebThreadImpl* GetWebThread() { return &thread_; }
 
@@ -48,8 +53,10 @@ class CompositorThread {
   void HandleInputEvent(int routing_id,
                         const WebKit::WebInputEvent* input_event);
 
+  void OnCompositorMessageReceived(const IPC::Message& message);
+
   // Called from the compositor's thread.
-  void AddInputHandlerOnCompositorThread(
+  void AddHandlersOnCompositorThread(
       int routing_id,
       int input_handler_id,
       scoped_refptr<base::MessageLoopProxy> main_loop,
@@ -63,7 +70,8 @@ class CompositorThread {
   InputHandlerMap input_handlers_;
 
   webkit_glue::WebThreadImpl thread_;
-  scoped_refptr<InputEventFilter> filter_;
+  scoped_refptr<InputEventFilter> input_filter_;
+  scoped_refptr<IPC::ForwardingMessageFilter> compositor_filter_;
 };
 
 #endif  // CONTENT_RENDERER_GPU_COMPOSITOR_THREAD_H_