mus: Change PointerWatcher to observe all pointer events, with moves optional.

services/ui/ws/window_tree.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 SERVICES_UI_WS_WINDOW_TREE_H_
 #define SERVICES_UI_WS_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 223 matching lines @@
                            const ServerWindow* new_focused_window);
   void ProcessLostCapture(const ServerWindow* old_lost_capture,
                           bool originated_change);
   void ProcessTransientWindowAdded(const ServerWindow* window,
                                    const ServerWindow* transient_window,
                                    bool originated_change);
   void ProcessTransientWindowRemoved(const ServerWindow* window,
                                      const ServerWindow* transient_window,
                                      bool originated_change);
 
-  // Sends this event to the client if it matches an active event observer.
-  void SendToEventObserver(const ui::Event& event);
+  // Sends this event to the client if it matches an active pointer watcher.
+  void SendToPointerWatcher(const ui::Event& event);
 
  private:
   friend class test::WindowTreeTestApi;
 
   struct WaitingForTopLevelWindowInfo {
     WaitingForTopLevelWindowInfo(const ClientWindowId& client_window_id,
                                  uint32_t wm_change_id)
         : client_window_id(client_window_id), wm_change_id(wm_change_id) {}
     ~WaitingForTopLevelWindowInfo() {}
 
@@ skipping 74 matching lines @@
   bool CanEmbed(const ClientWindowId& window_id) const;
   void PrepareForEmbed(ServerWindow* window);
   void RemoveChildrenAsPartOfEmbed(ServerWindow* window);
 
   // Generates a new event id for an accelerator or event ack, sets it in
   // |event_ack_id_| and returns it.
   uint32_t GenerateEventAckId();
 
   void DispatchInputEventImpl(ServerWindow* target, const ui::Event& event);
 
+  // Returns true if the client has a pointer watcher and this event matches.
+  bool EventMatchesPointerWatcher(const ui::Event& event);
+
   // Calls OnChangeCompleted() on the client.
   void NotifyChangeCompleted(uint32_t change_id,
                              mojom::WindowManagerErrorCode error_code);
 
   // WindowTree:
   void NewWindow(uint32_t change_id,
                  Id transport_window_id,
                  mojo::Map<mojo::String, mojo::Array<uint8_t>>
                      transport_properties) override;
   void NewTopLevelWindow(uint32_t change_id,
@@ skipping 12 matching lines @@
   void ReorderWindow(uint32_t change_Id,
                      Id window_id,
                      Id relative_window_id,
                      mojom::OrderDirection direction) override;
   void GetWindowTree(
       Id window_id,
       const base::Callback<void(mojo::Array<mojom::WindowDataPtr>)>& callback)
       override;
   void SetCapture(uint32_t change_id, Id window_id) override;
   void ReleaseCapture(uint32_t change_id, Id window_id) override;
-  void SetEventObserver(mojom::EventMatcherPtr matcher,
-                        uint32_t observer_id) override;
+  void StartPointerWatcher(bool want_moves,
+                           uint32_t pointer_watcher_id) override;
+  void StopPointerWatcher() override;
   void SetWindowBounds(uint32_t change_id,
                        Id window_id,
                        const gfx::Rect& bounds) override;
   void SetWindowVisibility(uint32_t change_id,
                            Id window_id,
                            bool visible) override;
   void SetWindowProperty(uint32_t change_id,
                          Id transport_window_id,
                          const mojo::String& name,
                          mojo::Array<uint8_t> value) override;
@@ skipping 94 matching lines @@
   // client (ClientWindowId).
   base::hash_map<ClientWindowId, WindowId> client_id_to_window_id_map_;
   base::hash_map<WindowId, ClientWindowId> window_id_to_client_id_map_;
 
   uint32_t event_ack_id_;
 
   // A client is considered janky if it hasn't ACK'ed input events within a
   // reasonable timeframe.
   bool janky_ = false;
 
-  // Set when the client is using SetEventObserver() to observe events,
-  // otherwise null.
-  std::unique_ptr<EventMatcher> event_observer_matcher_;
+  // Whether the client is observing pointer events.
+  bool has_pointer_watcher_ = false;

[sky, 2016/08/04 20:40:26]

Why do we need both has_pointer_watcher_ and pointer_watcher_id_? If
pointer_watcher_id_ is 0 doesn't that mean there is no pointer watcher?

[riajiang, 2016/08/05 17:36:03]

Removed.

 
-  // The ID supplied by the client for the current event observer.
-  uint32_t event_observer_id_ = 0;
+  // For performance reasons, only send move events if the client explicitly
+  // requests them.
+  bool pointer_watcher_want_moves_ = false;
+
+  // The ID supplied by the client for the current pointer watcher.
+  uint32_t pointer_watcher_id_ = 0;
 
   // WindowManager the current event came from.
   WindowManagerState* event_source_wms_ = nullptr;
 
   std::queue<std::unique_ptr<TargetedEvent>> event_queue_;
 
   std::unique_ptr<mojo::AssociatedBinding<mojom::WindowManagerClient>>
       window_manager_internal_client_binding_;
   mojom::WindowManager* window_manager_internal_;
   std::unique_ptr<WindowManagerState> window_manager_state_;
 
   std::unique_ptr<WaitingForTopLevelWindowInfo>
       waiting_for_top_level_window_info_;
   bool embedder_intercepts_events_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTree);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_TREE_H_