| 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 <set> | 10 #include <set> |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 void AckAllChangesOfType(WindowTreeChangeType type, bool result); | 77 void AckAllChangesOfType(WindowTreeChangeType type, bool result); |
| 78 | 78 |
| 79 bool GetAndRemoveFirstChangeOfType(WindowTreeChangeType type, | 79 bool GetAndRemoveFirstChangeOfType(WindowTreeChangeType type, |
| 80 uint32_t* change_id); | 80 uint32_t* change_id); |
| 81 | 81 |
| 82 size_t GetChangeCountForType(WindowTreeChangeType type); | 82 size_t GetChangeCountForType(WindowTreeChangeType type); |
| 83 | 83 |
| 84 // Data from the most recently added/removed transient window. | 84 // Data from the most recently added/removed transient window. |
| 85 const TransientData& transient_data() const { return transient_data_; } | 85 const TransientData& transient_data() const { return transient_data_; } |
| 86 | 86 |
| 87 const gfx::Insets& last_client_area() const { return last_client_area_; } |
| 88 |
| 89 const base::Optional<gfx::Rect>& last_hit_test_mask() const { |
| 90 return last_hit_test_mask_; |
| 91 } |
| 92 |
| 87 private: | 93 private: |
| 88 struct Change { | 94 struct Change { |
| 89 WindowTreeChangeType type; | 95 WindowTreeChangeType type; |
| 90 uint32_t id; | 96 uint32_t id; |
| 91 }; | 97 }; |
| 92 | 98 |
| 93 void OnChangeReceived( | 99 void OnChangeReceived( |
| 94 uint32_t change_id, | 100 uint32_t change_id, |
| 95 WindowTreeChangeType type = WindowTreeChangeType::OTHER); | 101 WindowTreeChangeType type = WindowTreeChangeType::OTHER); |
| 96 | 102 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 | 197 |
| 192 std::vector<Change> changes_; | 198 std::vector<Change> changes_; |
| 193 | 199 |
| 194 ui::mojom::WindowTreeClient* client_; | 200 ui::mojom::WindowTreeClient* client_; |
| 195 | 201 |
| 196 base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>> | 202 base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>> |
| 197 last_new_window_properties_; | 203 last_new_window_properties_; |
| 198 | 204 |
| 199 TransientData transient_data_; | 205 TransientData transient_data_; |
| 200 | 206 |
| 207 gfx::Insets last_client_area_; |
| 208 |
| 209 base::Optional<gfx::Rect> last_hit_test_mask_; |
| 210 |
| 201 DISALLOW_COPY_AND_ASSIGN(TestWindowTree); | 211 DISALLOW_COPY_AND_ASSIGN(TestWindowTree); |
| 202 }; | 212 }; |
| 203 | 213 |
| 204 } // namespace aura | 214 } // namespace aura |
| 205 | 215 |
| 206 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ | 216 #endif // UI_AURA_TEST_MUS_TEST_WINDOW_TREE_H_ |
| OLD | NEW |