| 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 "services/ui/public/interfaces/cursor.mojom.h" | 15 #include "services/ui/public/interfaces/cursor.mojom.h" |
| 16 #include "services/ui/public/interfaces/window_tree_constants.mojom.h" |
| 16 #include "ui/aura/aura_export.h" | 17 #include "ui/aura/aura_export.h" |
| 17 #include "ui/aura/mus/mus_types.h" | 18 #include "ui/aura/mus/mus_types.h" |
| 19 #include "ui/aura/mus/window_compositor_frame_sink.h" |
| 18 #include "ui/aura/mus/window_mus.h" | 20 #include "ui/aura/mus/window_mus.h" |
| 19 #include "ui/aura/window_port.h" | 21 #include "ui/aura/window_port.h" |
| 20 #include "ui/gfx/geometry/rect.h" | 22 #include "ui/gfx/geometry/rect.h" |
| 21 #include "ui/platform_window/mojo/text_input_state.mojom.h" | 23 #include "ui/platform_window/mojo/text_input_state.mojom.h" |
| 22 | 24 |
| 23 namespace aura { | 25 namespace aura { |
| 24 | 26 |
| 25 class PropertyConverter; | 27 class PropertyConverter; |
| 26 class SurfaceIdHandler; | 28 class SurfaceIdHandler; |
| 27 class Window; | 29 class Window; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 44 | 46 |
| 45 Window* window() { return window_; } | 47 Window* window() { return window_; } |
| 46 const Window* window() const { return window_; } | 48 const Window* window() const { return window_; } |
| 47 | 49 |
| 48 void SetTextInputState(mojo::TextInputStatePtr state); | 50 void SetTextInputState(mojo::TextInputStatePtr state); |
| 49 void SetImeVisibility(bool visible, mojo::TextInputStatePtr state); | 51 void SetImeVisibility(bool visible, mojo::TextInputStatePtr state); |
| 50 | 52 |
| 51 ui::mojom::Cursor predefined_cursor() const { return predefined_cursor_; } | 53 ui::mojom::Cursor predefined_cursor() const { return predefined_cursor_; } |
| 52 void SetPredefinedCursor(ui::mojom::Cursor cursor_id); | 54 void SetPredefinedCursor(ui::mojom::Cursor cursor_id); |
| 53 | 55 |
| 56 std::unique_ptr<WindowCompositorFrameSink> RequestCompositorFrameSink( |
| 57 ui::mojom::CompositorFrameSinkType type, |
| 58 scoped_refptr<cc::ContextProvider> context_provider, |
| 59 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager); |
| 60 |
| 61 void AttachCompositorFrameSink( |
| 62 ui::mojom::CompositorFrameSinkType type, |
| 63 std::unique_ptr<WindowCompositorFrameSinkBinding> |
| 64 compositor_frame_sink_binding); |
| 65 |
| 54 void set_surface_id_handler(SurfaceIdHandler* surface_id_handler) { | 66 void set_surface_id_handler(SurfaceIdHandler* surface_id_handler) { |
| 55 surface_id_handler_ = surface_id_handler; | 67 surface_id_handler_ = surface_id_handler; |
| 56 } | 68 } |
| 57 | 69 |
| 58 private: | 70 private: |
| 59 friend class WindowPortMusTestApi; | 71 friend class WindowPortMusTestApi; |
| 60 friend class WindowTreeClient; | 72 friend class WindowTreeClient; |
| 61 friend class WindowTreeClientPrivate; | 73 friend class WindowTreeClientPrivate; |
| 62 | 74 |
| 63 using ServerChangeIdType = uint8_t; | 75 using ServerChangeIdType = uint8_t; |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 std::unique_ptr<SurfaceInfo> surface_info_; | 225 std::unique_ptr<SurfaceInfo> surface_info_; |
| 214 | 226 |
| 215 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; | 227 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; |
| 216 | 228 |
| 217 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); | 229 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); |
| 218 }; | 230 }; |
| 219 | 231 |
| 220 } // namespace aura | 232 } // namespace aura |
| 221 | 233 |
| 222 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ | 234 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ |
| OLD | NEW |