| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_MUS_WS_DISPLAY_H_ | 5 #ifndef COMPONENTS_MUS_WS_DISPLAY_H_ |
| 6 #define COMPONENTS_MUS_WS_DISPLAY_H_ | 6 #define COMPONENTS_MUS_WS_DISPLAY_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 WindowManagerFactoryService* service); | 158 WindowManagerFactoryService* service); |
| 159 | 159 |
| 160 // PlatformDisplayDelegate: | 160 // PlatformDisplayDelegate: |
| 161 ServerWindow* GetRootWindow() override; | 161 ServerWindow* GetRootWindow() override; |
| 162 void OnEvent(const ui::Event& event) override; | 162 void OnEvent(const ui::Event& event) override; |
| 163 void OnNativeCaptureLost() override; | 163 void OnNativeCaptureLost() override; |
| 164 void OnDisplayClosed() override; | 164 void OnDisplayClosed() override; |
| 165 void OnViewportMetricsChanged( | 165 void OnViewportMetricsChanged( |
| 166 const mojom::ViewportMetrics& old_metrics, | 166 const mojom::ViewportMetrics& old_metrics, |
| 167 const mojom::ViewportMetrics& new_metrics) override; | 167 const mojom::ViewportMetrics& new_metrics) override; |
| 168 void OnTopLevelSurfaceChanged(cc::SurfaceId surface_id) override; | |
| 169 void OnCompositorFrameDrawn() override; | 168 void OnCompositorFrameDrawn() override; |
| 170 | 169 |
| 171 // FocusControllerDelegate: | 170 // FocusControllerDelegate: |
| 172 bool CanHaveActiveChildren(ServerWindow* window) const override; | 171 bool CanHaveActiveChildren(ServerWindow* window) const override; |
| 173 | 172 |
| 174 // FocusControllerObserver: | 173 // FocusControllerObserver: |
| 175 void OnActivationChanged(ServerWindow* old_active_window, | 174 void OnActivationChanged(ServerWindow* old_active_window, |
| 176 ServerWindow* new_active_window) override; | 175 ServerWindow* new_active_window) override; |
| 177 void OnFocusChanged(FocusControllerChangeSource change_source, | 176 void OnFocusChanged(FocusControllerChangeSource change_source, |
| 178 ServerWindow* old_focused_window, | 177 ServerWindow* old_focused_window, |
| (...skipping 24 matching lines...) Expand all Loading... |
| 203 int32_t last_cursor_; | 202 int32_t last_cursor_; |
| 204 | 203 |
| 205 ServerWindowTracker activation_parents_; | 204 ServerWindowTracker activation_parents_; |
| 206 | 205 |
| 207 // Set of windows with surfaces that need to be destroyed once the frame | 206 // Set of windows with surfaces that need to be destroyed once the frame |
| 208 // draws. | 207 // draws. |
| 209 std::set<ServerWindow*> windows_needing_frame_destruction_; | 208 std::set<ServerWindow*> windows_needing_frame_destruction_; |
| 210 | 209 |
| 211 WindowManagerStateMap window_manager_state_map_; | 210 WindowManagerStateMap window_manager_state_map_; |
| 212 | 211 |
| 213 cc::SurfaceId top_level_surface_id_; | |
| 214 | |
| 215 DISALLOW_COPY_AND_ASSIGN(Display); | 212 DISALLOW_COPY_AND_ASSIGN(Display); |
| 216 }; | 213 }; |
| 217 | 214 |
| 218 } // namespace ws | 215 } // namespace ws |
| 219 } // namespace mus | 216 } // namespace mus |
| 220 | 217 |
| 221 #endif // COMPONENTS_MUS_WS_DISPLAY_H_ | 218 #endif // COMPONENTS_MUS_WS_DISPLAY_H_ |
| OLD | NEW |