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