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

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

Issue 2610723002: Unify SurfaceInfo (Closed)
Patch Set: Cleanup offscreen canvas Created 3 years, 11 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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "cc/surfaces/surface_info.h"
15 #include "services/ui/public/interfaces/cursor.mojom.h" 16 #include "services/ui/public/interfaces/cursor.mojom.h"
16 #include "services/ui/public/interfaces/window_tree.mojom.h" 17 #include "services/ui/public/interfaces/window_tree.mojom.h"
17 #include "services/ui/public/interfaces/window_tree_constants.mojom.h" 18 #include "services/ui/public/interfaces/window_tree_constants.mojom.h"
18 #include "ui/aura/aura_export.h" 19 #include "ui/aura/aura_export.h"
19 #include "ui/aura/mus/mus_types.h" 20 #include "ui/aura/mus/mus_types.h"
20 #include "ui/aura/mus/window_compositor_frame_sink.h" 21 #include "ui/aura/mus/window_compositor_frame_sink.h"
21 #include "ui/aura/mus/window_mus.h" 22 #include "ui/aura/mus/window_mus.h"
22 #include "ui/aura/window_port.h" 23 #include "ui/aura/window_port.h"
23 #include "ui/gfx/geometry/rect.h" 24 #include "ui/gfx/geometry/rect.h"
24 #include "ui/platform_window/mojo/text_input_state.mojom.h" 25 #include "ui/platform_window/mojo/text_input_state.mojom.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 void ReorderFromServer(WindowMus* child, 203 void ReorderFromServer(WindowMus* child,
203 WindowMus* relative, 204 WindowMus* relative,
204 ui::mojom::OrderDirection) override; 205 ui::mojom::OrderDirection) override;
205 void SetBoundsFromServer(const gfx::Rect& bounds) override; 206 void SetBoundsFromServer(const gfx::Rect& bounds) override;
206 void SetVisibleFromServer(bool visible) override; 207 void SetVisibleFromServer(bool visible) override;
207 void SetOpacityFromServer(float opacity) override; 208 void SetOpacityFromServer(float opacity) override;
208 void SetPredefinedCursorFromServer(ui::mojom::Cursor cursor) override; 209 void SetPredefinedCursorFromServer(ui::mojom::Cursor cursor) override;
209 void SetPropertyFromServer( 210 void SetPropertyFromServer(
210 const std::string& property_name, 211 const std::string& property_name,
211 const std::vector<uint8_t>* property_data) override; 212 const std::vector<uint8_t>* property_data) override;
212 void SetSurfaceIdFromServer( 213 void SetSurfaceInfoFromServer(const cc::SurfaceInfo& surface_info) override;
213 std::unique_ptr<SurfaceInfo> surface_info) override;
214 void DestroyFromServer() override; 214 void DestroyFromServer() override;
215 void AddTransientChildFromServer(WindowMus* child) override; 215 void AddTransientChildFromServer(WindowMus* child) override;
216 void RemoveTransientChildFromServer(WindowMus* child) override; 216 void RemoveTransientChildFromServer(WindowMus* child) override;
217 ChangeSource OnTransientChildAdded(WindowMus* child) override; 217 ChangeSource OnTransientChildAdded(WindowMus* child) override;
218 ChangeSource OnTransientChildRemoved(WindowMus* child) override; 218 ChangeSource OnTransientChildRemoved(WindowMus* child) override;
219 std::unique_ptr<WindowMusChangeData> PrepareForServerBoundsChange( 219 std::unique_ptr<WindowMusChangeData> PrepareForServerBoundsChange(
220 const gfx::Rect& bounds) override; 220 const gfx::Rect& bounds) override;
221 std::unique_ptr<WindowMusChangeData> PrepareForServerVisibilityChange( 221 std::unique_ptr<WindowMusChangeData> PrepareForServerVisibilityChange(
222 bool value) override; 222 bool value) override;
223 void PrepareForDestroy() override; 223 void PrepareForDestroy() override;
(...skipping 16 matching lines...) Expand all
240 std::unique_ptr<WindowPortPropertyData> data) override; 240 std::unique_ptr<WindowPortPropertyData> data) override;
241 241
242 WindowTreeClient* window_tree_client_; 242 WindowTreeClient* window_tree_client_;
243 243
244 Window* window_ = nullptr; 244 Window* window_ = nullptr;
245 245
246 ServerChangeIdType next_server_change_id_ = 0; 246 ServerChangeIdType next_server_change_id_ = 0;
247 ServerChanges server_changes_; 247 ServerChanges server_changes_;
248 248
249 SurfaceIdHandler* surface_id_handler_ = nullptr; 249 SurfaceIdHandler* surface_id_handler_ = nullptr;
250 std::unique_ptr<SurfaceInfo> surface_info_; 250 cc::SurfaceInfo surface_info_;
251 251
252 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; 252 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL;
253 253
254 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); 254 DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
255 }; 255 };
256 256
257 } // namespace aura 257 } // namespace aura
258 258
259 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ 259 #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