Linux: Refactor X11DesktopHandler

ui/events/platform/x11/x11_event_source.h

 // Copyright 2014 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 UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_
 #define UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 55 matching lines @@
   // asynchronous (and we receive an XEvent when mapped), while there are also
   // functions which require a mapped window.
   void BlockUntilWindowMapped(XID window);
 
   void BlockUntilWindowUnmapped(XID window);
 
   XDisplay* display() { return display_; }
   Time last_seen_server_time() const { return last_seen_server_time_; }
 
   // Explicitly asks the X11 server for the current timestamp, and updates
-  // |last_seen_server_time| with this value.
+  // |last_seen_server_time_| with this value.
   Time UpdateLastSeenServerTime();
 
+  // Sets |last_seen_server_time_| to |time| if this would cause the time to
+  // move forward.
+  void SetLastSeenServerTime(Time time);
+
+  // Returns the timestamp of the event currently being dispatched.  Falls back
+  // on UpdateLastSeenServerTime() if there's no event being dispatched, or if
+  // the current event does not have a timestamp.
+  Time GetTimestamp();
+
   void StopCurrentEventStream();
   void OnDispatcherListChanged();
 
  protected:
   // Extracts cookie data from |xevent| if it's of GenericType, and dispatches
   // the event. This function also frees up the cookie data after dispatch is
   // complete.
   void ExtractCookieDataDispatchEvent(XEvent* xevent);
 
   // Handles updates after event has been dispatched.
   void PostDispatchEvent(XEvent* xevent);
 
   // Block until receiving a structure notify event of |type| on |window|.
   // Dispatch all encountered events prior to the one we're blocking on.
   void BlockOnWindowStructureEvent(XID window, int type);
 
  private:
   static X11EventSource* instance_;
 
   X11EventSourceDelegate* delegate_;
 
   // The connection to the X11 server used to receive the events.
   XDisplay* display_;
 
   // The last timestamp seen in an XEvent.
   Time last_seen_server_time_;
 
+  // The timestamp of the event being dispatched.
+  Time event_timestamp_;
+
   // State necessary for UpdateLastSeenServerTime
   bool dummy_initialized_;
   XWindow dummy_window_;
   XAtom dummy_atom_;
 
   // Keeps track of whether this source should continue to dispatch all the
   // available events.
   bool continue_stream_ = true;
 
   std::unique_ptr<X11HotplugEventHandler> hotplug_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(X11EventSource);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_