| 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 UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ | 5 #ifndef UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ |
| 6 #define UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ | 6 #define UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 87 |
| 88 // Data from the most recently added/removed transient window. | 88 // Data from the most recently added/removed transient window. |
| 89 const TransientData& transient_data() const { return transient_data_; } | 89 const TransientData& transient_data() const { return transient_data_; } |
| 90 | 90 |
| 91 const gfx::Insets& last_client_area() const { return last_client_area_; } | 91 const gfx::Insets& last_client_area() const { return last_client_area_; } |
| 92 | 92 |
| 93 const base::Optional<gfx::Rect>& last_hit_test_mask() const { | 93 const base::Optional<gfx::Rect>& last_hit_test_mask() const { |
| 94 return last_hit_test_mask_; | 94 return last_hit_test_mask_; |
| 95 } | 95 } |
| 96 | 96 |
| 97 const base::Optional<cc::LocalSurfaceId>& last_local_surface_id() const { |
| 98 return last_local_surface_id_; |
| 99 } |
| 100 |
| 97 private: | 101 private: |
| 98 struct Change { | 102 struct Change { |
| 99 WindowTreeChangeType type; | 103 WindowTreeChangeType type; |
| 100 uint32_t id; | 104 uint32_t id; |
| 101 }; | 105 }; |
| 102 | 106 |
| 103 void OnChangeReceived( | 107 void OnChangeReceived( |
| 104 uint32_t change_id, | 108 uint32_t change_id, |
| 105 WindowTreeChangeType type = WindowTreeChangeType::OTHER); | 109 WindowTreeChangeType type = WindowTreeChangeType::OTHER); |
| 106 | 110 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 | 225 |
| 222 base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>> | 226 base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>> |
| 223 last_new_window_properties_; | 227 last_new_window_properties_; |
| 224 | 228 |
| 225 TransientData transient_data_; | 229 TransientData transient_data_; |
| 226 | 230 |
| 227 gfx::Insets last_client_area_; | 231 gfx::Insets last_client_area_; |
| 228 | 232 |
| 229 base::Optional<gfx::Rect> last_hit_test_mask_; | 233 base::Optional<gfx::Rect> last_hit_test_mask_; |
| 230 | 234 |
| 235 base::Optional<cc::LocalSurfaceId> last_local_surface_id_; |
| 236 |
| 231 DISALLOW_COPY_AND_ASSIGN(TestWindowTree); | 237 DISALLOW_COPY_AND_ASSIGN(TestWindowTree); |
| 232 }; | 238 }; |
| 233 | 239 |
| 234 } // namespace aura | 240 } // namespace aura |
| 235 | 241 |
| 236 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ | 242 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ |
| OLD | NEW |