MessagePumpAuraX11: Make root_window_dispatchers_ an ObserverList.

base/message_pump_aurax11.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_MESSAGE_PUMP_AURAX11_H
 #define BASE_MESSAGE_PUMP_AURAX11_H
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_pump.h"
 #include "base/message_pump_glib.h"
 #include "base/message_pump_dispatcher.h"
 #include "base/message_pump_observer.h"
 
 #include <bitset>
 #include <map>
 #include <vector>

[willchan no longer on Chromium, 2012/12/19 17:25:42]

Can you get rid of this now?

 
 // It would be nice to include the X11 headers here so that we use Window
 // instead of its typedef of unsigned long, but we can't because everything in
 // chrome includes us through base/message_loop.h, and X11's crappy #define
 // heavy headers muck up half of chrome.
 
 typedef struct _GPollFD GPollFD;
 typedef struct _GSource GSource;
 typedef struct _XDisplay Display;
 
@@ skipping 43 matching lines @@
   // 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);
 
  protected:
   virtual ~MessagePumpAuraX11();
 
  private:
   typedef std::map<unsigned long, MessagePumpDispatcher*> DispatchersMap;
-  typedef std::vector<MessagePumpDispatcher*> Dispatchers;
 
   // Initializes the glib event source for X.
   void InitXSource();
 
   // Dispatches the XEvent and returns true if we should exit the current loop
   // of message processing.
   bool 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 base::NativeEvent& xev) const;
 
   // Overridden from MessagePumpDispatcher:
   virtual bool Dispatch(const base::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_;
-  Dispatchers root_window_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_;

[willchan no longer on Chromium, 2012/12/19 17:25:42]

YOu need the #include for this.

 
   unsigned long x_root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpAuraX11);
 };
 
 typedef MessagePumpAuraX11 MessagePumpForUI;
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_PUMP_AURAX11_H