Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(671)

Side by Side Diff: ui/aura/mus/in_flight_change.h

Issue 2582823002: WIP: Surface Synchronization System
Patch Set: First cut propagating LocalSurfaceId when WindowTreeHost requests resize Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/aura/mus/client_surface_embedder.cc ('k') | ui/aura/mus/in_flight_change.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_MUS_IN_FLIGHT_CHANGE_H_ 5 #ifndef UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
6 #define UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ 6 #define UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/optional.h"
17 #include "cc/surfaces/local_surface_id.h"
16 #include "ui/aura/window_observer.h" 18 #include "ui/aura/window_observer.h"
17 #include "ui/base/ui_base_types.h" 19 #include "ui/base/ui_base_types.h"
18 #include "ui/gfx/geometry/rect.h" 20 #include "ui/gfx/geometry/rect.h"
19 21
20 namespace ui { 22 namespace ui {
21 23
22 namespace mojom { 24 namespace mojom {
23 enum class Cursor : int32_t; 25 enum class Cursor : int32_t;
24 } 26 }
25 27
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // outstanding, revert the value. 134 // outstanding, revert the value.
133 virtual void Revert() = 0; 135 virtual void Revert() = 0;
134 136
135 private: 137 private:
136 WindowMus* window_; 138 WindowMus* window_;
137 const ChangeType change_type_; 139 const ChangeType change_type_;
138 }; 140 };
139 141
140 class InFlightBoundsChange : public InFlightChange { 142 class InFlightBoundsChange : public InFlightChange {
141 public: 143 public:
142 InFlightBoundsChange(WindowTreeClient* window_tree_client, 144 InFlightBoundsChange(
143 WindowMus* window, 145 WindowTreeClient* window_tree_client,
144 const gfx::Rect& revert_bounds); 146 WindowMus* window,
147 const gfx::Rect& revert_bounds,
148 const base::Optional<cc::LocalSurfaceId>& local_surface_id);
149 ~InFlightBoundsChange() override;
145 150
146 // InFlightChange: 151 // InFlightChange:
147 void SetRevertValueFrom(const InFlightChange& change) override; 152 void SetRevertValueFrom(const InFlightChange& change) override;
148 void Revert() override; 153 void Revert() override;
149 154
150 private: 155 private:
151 WindowTreeClient* window_tree_client_; 156 WindowTreeClient* window_tree_client_;
152 gfx::Rect revert_bounds_; 157 gfx::Rect revert_bounds_;
158 base::Optional<cc::LocalSurfaceId> revert_local_surface_id_;
153 159
154 DISALLOW_COPY_AND_ASSIGN(InFlightBoundsChange); 160 DISALLOW_COPY_AND_ASSIGN(InFlightBoundsChange);
155 }; 161 };
156 162
157 class InFlightDragChange : public InFlightChange { 163 class InFlightDragChange : public InFlightChange {
158 public: 164 public:
159 InFlightDragChange(WindowMus* window, ChangeType type); 165 InFlightDragChange(WindowMus* window, ChangeType type);
160 166
161 // InFlightChange: 167 // InFlightChange:
162 void SetRevertValueFrom(const InFlightChange& change) override; 168 void SetRevertValueFrom(const InFlightChange& change) override;
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 331
326 private: 332 private:
327 ui::ModalType revert_modal_type_; 333 ui::ModalType revert_modal_type_;
328 334
329 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalTypeChange); 335 DISALLOW_COPY_AND_ASSIGN(InFlightSetModalTypeChange);
330 }; 336 };
331 337
332 } // namespace aura 338 } // namespace aura
333 339
334 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_ 340 #endif // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/client_surface_embedder.cc ('k') | ui/aura/mus/in_flight_change.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698