x11: Move X event handling out of the message-pump.

base/message_loop/message_pump_x11.h

Index: base/message_loop/message_pump_x11.h
diff --git a/base/message_loop/message_pump_x11.h b/base/message_loop/message_pump_x11.h
index ce20d5d333cf0f86be9e64a282a05af46bf486e7..9a61a22559899a7d1fed1e069b6f8ba16b9f2e97 100644
--- a/base/message_loop/message_pump_x11.h
+++ b/base/message_loop/message_pump_x11.h
@@ -31,8 +31,7 @@ namespace base {
 // If there's a current dispatcher given through RunWithDispatcher(), that
 // dispatcher receives events. Otherwise, we route to messages to dispatchers
 // who have subscribed to messages from a specific X11 window.
-class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib,
-                                   public MessagePumpDispatcher {
+class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib {
  public:
   MessagePumpX11();
   virtual ~MessagePumpX11();
@@ -43,18 +42,6 @@ class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib,
   // Returns the UI or GPU message pump.
   static MessagePumpX11* Current();
 
-  // Adds/Removes |dispatcher| for the |xid|. This will route all messages from
-  // the window |xid| to |dispatcher.
-  void AddDispatcherForWindow(MessagePumpDispatcher* dispatcher,
-                              unsigned long xid);
-  void RemoveDispatcherForWindow(unsigned long xid);
-
-  // Adds/Removes |dispatcher| to receive all events sent to the X root
-  // window. A root window can have multiple dispatchers, and events on root
-  // windows will be dispatched to all.
-  void AddDispatcherForRootWindow(MessagePumpDispatcher* dispatcher);
-  void RemoveDispatcherForRootWindow(MessagePumpDispatcher* dispatcher);
-
   // Adds an Observer, which will start receiving notifications immediately.
   void AddObserver(MessagePumpObserver* observer);
 
@@ -62,62 +49,16 @@ class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib,
   // receiving a notification callback.
   void RemoveObserver(MessagePumpObserver* observer);
 
-  // Internal function. Called by the glib source dispatch function. Processes
-  // all available X events.
-  void DispatchXEvents();
-
-  // Blocks on the X11 event queue until we receive notification from the
-  // xserver that |w| has been mapped; StructureNotifyMask events on |w| are
-  // pulled out from the queue and dispatched out of order.
-  //
-  // For those that know X11, this is really a wrapper around XWindowEvent
-  // which still makes sure the preempted event is dispatched instead of
-  // dropped on the floor. This method exists because mapping a window is
-  // asynchronous (and we receive an XEvent when mapped), while there are also
-  // functions which require a mapped window.
-  void BlockUntilWindowMapped(unsigned long xid);
-
- private:
-  typedef std::map<unsigned long, MessagePumpDispatcher*> DispatchersMap;
-
-  // Initializes the glib event source for X.
-  void InitXSource();
-
-  // Dispatches the event to the specified dispatcher.
-  void ProcessXEvent(MessagePumpDispatcher* dispatcher, XEvent* event);
-
   // Sends the event to the observers. If an observer returns true, then it does
   // not send the event to any other observers and returns true. Returns false
   // if no observer returns true.
   bool WillProcessXEvent(XEvent* xevent);
   void DidProcessXEvent(XEvent* xevent);
 
-  // Returns the Dispatcher based on the event's target window.
-  MessagePumpDispatcher* GetDispatcherForXEvent(const NativeEvent& xev) const;
-
-  ObserverList<MessagePumpObserver>& observers() { return observers_; }
-
-  // Overridden from MessagePumpDispatcher:
-  virtual uint32_t Dispatch(const NativeEvent& event) OVERRIDE;
-
-  // The event source for X events.
-  GSource* x_source_;
-
-  // The poll attached to |x_source_|.
-  scoped_ptr<GPollFD> x_poll_;
-
-  DispatchersMap dispatchers_;
-
-  // Dispatch calls can cause addition of new dispatchers as we iterate
-  // through them. Use ObserverList to ensure the iterator remains valid across
-  // additions.
-  ObserverList<MessagePumpDispatcher> root_window_dispatchers_;
-
+ private:
   // List of observers.
   ObserverList<MessagePumpObserver> observers_;
 
-  unsigned long x_root_window_;
-
   DISALLOW_COPY_AND_ASSIGN(MessagePumpX11);
 };