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

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

Issue 2780043002: Aura-Mus: Allocate a LocalSurfaceId on size change (Closed)
Patch Set: Cleanup Created 3 years, 8 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/window_mus.h ('k') | ui/aura/mus/window_port_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_WINDOW_PORT_MUS_H_ 5 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_
6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_ 6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 PropertyConverter* GetPropertyConverter(); 205 PropertyConverter* GetPropertyConverter();
206 206
207 // WindowMus: 207 // WindowMus:
208 Window* GetWindow() override; 208 Window* GetWindow() override;
209 void AddChildFromServer(WindowMus* window) override; 209 void AddChildFromServer(WindowMus* window) override;
210 void RemoveChildFromServer(WindowMus* child) override; 210 void RemoveChildFromServer(WindowMus* child) override;
211 void ReorderFromServer(WindowMus* child, 211 void ReorderFromServer(WindowMus* child,
212 WindowMus* relative, 212 WindowMus* relative,
213 ui::mojom::OrderDirection) override; 213 ui::mojom::OrderDirection) override;
214 void SetBoundsFromServer(const gfx::Rect& bounds) override; 214 void SetBoundsFromServer(
215 const gfx::Rect& bounds,
216 const base::Optional<cc::LocalSurfaceId>& local_surface_id) override;
215 void SetVisibleFromServer(bool visible) override; 217 void SetVisibleFromServer(bool visible) override;
216 void SetOpacityFromServer(float opacity) override; 218 void SetOpacityFromServer(float opacity) override;
217 void SetPredefinedCursorFromServer(ui::mojom::CursorType cursor) override; 219 void SetPredefinedCursorFromServer(ui::mojom::CursorType cursor) override;
218 void SetPropertyFromServer( 220 void SetPropertyFromServer(
219 const std::string& property_name, 221 const std::string& property_name,
220 const std::vector<uint8_t>* property_data) override; 222 const std::vector<uint8_t>* property_data) override;
221 void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override; 223 void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override;
224 const cc::LocalSurfaceId& GetOrAllocateLocalSurfaceId(
225 const gfx::Size& surface_size) override;
222 void SetSurfaceInfoFromServer(const cc::SurfaceInfo& surface_info) override; 226 void SetSurfaceInfoFromServer(const cc::SurfaceInfo& surface_info) override;
223 void DestroyFromServer() override; 227 void DestroyFromServer() override;
224 void AddTransientChildFromServer(WindowMus* child) override; 228 void AddTransientChildFromServer(WindowMus* child) override;
225 void RemoveTransientChildFromServer(WindowMus* child) override; 229 void RemoveTransientChildFromServer(WindowMus* child) override;
226 ChangeSource OnTransientChildAdded(WindowMus* child) override; 230 ChangeSource OnTransientChildAdded(WindowMus* child) override;
227 ChangeSource OnTransientChildRemoved(WindowMus* child) override; 231 ChangeSource OnTransientChildRemoved(WindowMus* child) override;
232 const cc::LocalSurfaceId& GetLocalSurfaceId() override;
228 std::unique_ptr<WindowMusChangeData> PrepareForServerBoundsChange( 233 std::unique_ptr<WindowMusChangeData> PrepareForServerBoundsChange(
229 const gfx::Rect& bounds) override; 234 const gfx::Rect& bounds) override;
230 std::unique_ptr<WindowMusChangeData> PrepareForServerVisibilityChange( 235 std::unique_ptr<WindowMusChangeData> PrepareForServerVisibilityChange(
231 bool value) override; 236 bool value) override;
232 void PrepareForDestroy() override; 237 void PrepareForDestroy() override;
233 void PrepareForTransientRestack(WindowMus* window) override; 238 void PrepareForTransientRestack(WindowMus* window) override;
234 void OnTransientRestackDone(WindowMus* window) override; 239 void OnTransientRestackDone(WindowMus* window) override;
235 void NotifyEmbeddedAppDisconnected() override; 240 void NotifyEmbeddedAppDisconnected() override;
236 241
237 // WindowPort: 242 // WindowPort:
(...skipping 19 matching lines...) Expand all
257 std::unique_ptr<ClientSurfaceEmbedder> client_surface_embedder; 262 std::unique_ptr<ClientSurfaceEmbedder> client_surface_embedder;
258 263
259 ServerChangeIdType next_server_change_id_ = 0; 264 ServerChangeIdType next_server_change_id_ = 0;
260 ServerChanges server_changes_; 265 ServerChanges server_changes_;
261 266
262 cc::FrameSinkId frame_sink_id_; 267 cc::FrameSinkId frame_sink_id_;
263 base::Closure pending_compositor_frame_sink_request_; 268 base::Closure pending_compositor_frame_sink_request_;
264 269
265 cc::SurfaceInfo surface_info_; 270 cc::SurfaceInfo surface_info_;
266 271
272 cc::LocalSurfaceId local_surface_id_;
273 cc::LocalSurfaceIdAllocator local_surface_id_allocator_;
274 gfx::Size last_surface_size_;
275
267 ui::mojom::CursorType predefined_cursor_ = ui::mojom::CursorType::CURSOR_NULL; 276 ui::mojom::CursorType predefined_cursor_ = ui::mojom::CursorType::CURSOR_NULL;
268 277
269 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); 278 DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
270 }; 279 };
271 280
272 } // namespace aura 281 } // namespace aura
273 282
274 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ 283 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_mus.h ('k') | ui/aura/mus/window_port_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698