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