OLD | NEW |
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 "cc/surfaces/surface_info.h" |
16 #include "services/ui/public/cpp/window_compositor_frame_sink.h" | 16 #include "services/ui/public/cpp/client_compositor_frame_sink.h" |
17 #include "services/ui/public/interfaces/cursor.mojom.h" | 17 #include "services/ui/public/interfaces/cursor.mojom.h" |
18 #include "services/ui/public/interfaces/window_tree.mojom.h" | 18 #include "services/ui/public/interfaces/window_tree.mojom.h" |
19 #include "services/ui/public/interfaces/window_tree_constants.mojom.h" | 19 #include "services/ui/public/interfaces/window_tree_constants.mojom.h" |
20 #include "ui/aura/aura_export.h" | 20 #include "ui/aura/aura_export.h" |
21 #include "ui/aura/mus/mus_types.h" | 21 #include "ui/aura/mus/mus_types.h" |
22 #include "ui/aura/mus/window_mus.h" | 22 #include "ui/aura/mus/window_mus.h" |
23 #include "ui/aura/window_port.h" | 23 #include "ui/aura/window_port.h" |
24 #include "ui/gfx/geometry/rect.h" | 24 #include "ui/gfx/geometry/rect.h" |
25 #include "ui/platform_window/mojo/text_input_state.mojom.h" | 25 #include "ui/platform_window/mojo/text_input_state.mojom.h" |
26 | 26 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 | 58 |
59 // Sets the EventTargetingPolicy, default is TARGET_AND_DESCENDANTS. | 59 // Sets the EventTargetingPolicy, default is TARGET_AND_DESCENDANTS. |
60 void SetEventTargetingPolicy(ui::mojom::EventTargetingPolicy policy); | 60 void SetEventTargetingPolicy(ui::mojom::EventTargetingPolicy policy); |
61 | 61 |
62 // Embeds a new client in this Window. See WindowTreeClient::Embed() for | 62 // Embeds a new client in this Window. See WindowTreeClient::Embed() for |
63 // details on arguments. | 63 // details on arguments. |
64 void Embed(ui::mojom::WindowTreeClientPtr client, | 64 void Embed(ui::mojom::WindowTreeClientPtr client, |
65 uint32_t flags, | 65 uint32_t flags, |
66 const ui::mojom::WindowTree::EmbedCallback& callback); | 66 const ui::mojom::WindowTree::EmbedCallback& callback); |
67 | 67 |
68 std::unique_ptr<ui::WindowCompositorFrameSink> RequestCompositorFrameSink( | 68 std::unique_ptr<ui::ClientCompositorFrameSink> RequestCompositorFrameSink( |
69 scoped_refptr<cc::ContextProvider> context_provider, | 69 scoped_refptr<cc::ContextProvider> context_provider, |
70 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager); | 70 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager); |
71 | 71 |
72 void AttachCompositorFrameSink( | 72 void AttachCompositorFrameSink( |
73 std::unique_ptr<ui::WindowCompositorFrameSinkBinding> | 73 std::unique_ptr<ui::ClientCompositorFrameSinkBinding> |
74 compositor_frame_sink_binding); | 74 compositor_frame_sink_binding); |
75 | 75 |
76 private: | 76 private: |
77 friend class WindowPortMusTestApi; | 77 friend class WindowPortMusTestApi; |
78 friend class WindowTreeClient; | 78 friend class WindowTreeClient; |
79 friend class WindowTreeClientPrivate; | 79 friend class WindowTreeClientPrivate; |
80 friend class WindowTreeHostMus; | 80 friend class WindowTreeHostMus; |
81 | 81 |
82 using ServerChangeIdType = uint8_t; | 82 using ServerChangeIdType = uint8_t; |
83 | 83 |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 cc::SurfaceInfo surface_info_; | 249 cc::SurfaceInfo surface_info_; |
250 | 250 |
251 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; | 251 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; |
252 | 252 |
253 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); | 253 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); |
254 }; | 254 }; |
255 | 255 |
256 } // namespace aura | 256 } // namespace aura |
257 | 257 |
258 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ | 258 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ |
OLD | NEW |