| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef SERVICES_UI_WS_WINDOW_TREE_H_ | 5 #ifndef SERVICES_UI_WS_WINDOW_TREE_H_ |
| 6 #define SERVICES_UI_WS_WINDOW_TREE_H_ | 6 #define SERVICES_UI_WS_WINDOW_TREE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 void ProcessTransientWindowRemoved(const ServerWindow* window, | 257 void ProcessTransientWindowRemoved(const ServerWindow* window, |
| 258 const ServerWindow* transient_window, | 258 const ServerWindow* transient_window, |
| 259 bool originated_change); | 259 bool originated_change); |
| 260 void ProcessWindowSurfaceChanged(ServerWindow* window, | 260 void ProcessWindowSurfaceChanged(ServerWindow* window, |
| 261 const cc::SurfaceInfo& surface_info); | 261 const cc::SurfaceInfo& surface_info); |
| 262 | 262 |
| 263 // Sends this event to the client if it matches an active pointer watcher. | 263 // Sends this event to the client if it matches an active pointer watcher. |
| 264 // |target_window| is the target of the event, and may be null or not known | 264 // |target_window| is the target of the event, and may be null or not known |
| 265 // to this tree. | 265 // to this tree. |
| 266 void SendToPointerWatcher(const ui::Event& event, | 266 void SendToPointerWatcher(const ui::Event& event, |
| 267 ServerWindow* target_window); | 267 ServerWindow* target_window, |
| 268 int64_t display_id); |
| 268 | 269 |
| 269 private: | 270 private: |
| 270 friend class test::WindowTreeTestApi; | 271 friend class test::WindowTreeTestApi; |
| 271 | 272 |
| 272 struct WaitingForTopLevelWindowInfo { | 273 struct WaitingForTopLevelWindowInfo { |
| 273 WaitingForTopLevelWindowInfo(const ClientWindowId& client_window_id, | 274 WaitingForTopLevelWindowInfo(const ClientWindowId& client_window_id, |
| 274 uint32_t wm_change_id) | 275 uint32_t wm_change_id) |
| 275 : client_window_id(client_window_id), wm_change_id(wm_change_id) {} | 276 : client_window_id(client_window_id), wm_change_id(wm_change_id) {} |
| 276 ~WaitingForTopLevelWindowInfo() {} | 277 ~WaitingForTopLevelWindowInfo() {} |
| 277 | 278 |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 waiting_for_top_level_window_info_; | 582 waiting_for_top_level_window_info_; |
| 582 bool embedder_intercepts_events_ = false; | 583 bool embedder_intercepts_events_ = false; |
| 583 | 584 |
| 584 DISALLOW_COPY_AND_ASSIGN(WindowTree); | 585 DISALLOW_COPY_AND_ASSIGN(WindowTree); |
| 585 }; | 586 }; |
| 586 | 587 |
| 587 } // namespace ws | 588 } // namespace ws |
| 588 } // namespace ui | 589 } // namespace ui |
| 589 | 590 |
| 590 #endif // SERVICES_UI_WS_WINDOW_TREE_H_ | 591 #endif // SERVICES_UI_WS_WINDOW_TREE_H_ |
| OLD | NEW |