| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 SERVICES_UI_WS_SERVER_WINDOW_H_ | 5 #ifndef SERVICES_UI_WS_SERVER_WINDOW_H_ |
| 6 #define SERVICES_UI_WS_SERVER_WINDOW_H_ | 6 #define SERVICES_UI_WS_SERVER_WINDOW_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 #include "cc/ipc/display_compositor.mojom.h" |
| 17 #include "mojo/public/cpp/bindings/binding.h" | 18 #include "mojo/public/cpp/bindings/binding.h" |
| 18 #include "services/ui/public/interfaces/window_tree.mojom.h" | 19 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 19 #include "services/ui/ws/ids.h" | 20 #include "services/ui/ws/ids.h" |
| 20 #include "ui/gfx/geometry/insets.h" | 21 #include "ui/gfx/geometry/insets.h" |
| 21 #include "ui/gfx/geometry/rect.h" | 22 #include "ui/gfx/geometry/rect.h" |
| 22 #include "ui/gfx/geometry/vector2d.h" | 23 #include "ui/gfx/geometry/vector2d.h" |
| 23 #include "ui/gfx/transform.h" | 24 #include "ui/gfx/transform.h" |
| 24 #include "ui/platform_window/text_input_state.h" | 25 #include "ui/platform_window/text_input_state.h" |
| 25 | 26 |
| 26 namespace ui { | 27 namespace ui { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 59 |
| 59 // Creates a new CompositorFrameSink of the specified type, replacing the | 60 // Creates a new CompositorFrameSink of the specified type, replacing the |
| 60 // existing. | 61 // existing. |
| 61 // TODO(fsamuel): We should not be passing in |gpu_memory_buffer_manager| and | 62 // TODO(fsamuel): We should not be passing in |gpu_memory_buffer_manager| and |
| 62 // |context_provider|. The window server should not know anything about them. | 63 // |context_provider|. The window server should not know anything about them. |
| 63 // Instead, they should be a CompositorFrameSink service-side implementation | 64 // Instead, they should be a CompositorFrameSink service-side implementation |
| 64 // detail. | 65 // detail. |
| 65 void CreateDisplayCompositorFrameSink( | 66 void CreateDisplayCompositorFrameSink( |
| 66 gfx::AcceleratedWidget widget, | 67 gfx::AcceleratedWidget widget, |
| 67 cc::mojom::MojoCompositorFrameSinkRequest request, | 68 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 68 cc::mojom::MojoCompositorFrameSinkClientPtr client); | 69 cc::mojom::MojoCompositorFrameSinkClientPtr client, |
| 70 cc::mojom::DisplayPrivatePtr display_private, |
| 71 cc::mojom::DisplayPrivateRequest display_request); |
| 69 void CreateOffscreenCompositorFrameSink( | 72 void CreateOffscreenCompositorFrameSink( |
| 70 mojom::CompositorFrameSinkType compositor_frame_sink_type, | 73 mojom::CompositorFrameSinkType compositor_frame_sink_type, |
| 71 cc::mojom::MojoCompositorFrameSinkRequest request, | 74 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 72 cc::mojom::MojoCompositorFrameSinkClientPtr client); | 75 cc::mojom::MojoCompositorFrameSinkClientPtr client); |
| 73 | 76 |
| 74 const WindowId& id() const { return id_; } | 77 const WindowId& id() const { return id_; } |
| 75 | 78 |
| 76 void Add(ServerWindow* child); | 79 void Add(ServerWindow* child); |
| 77 void Remove(ServerWindow* child); | 80 void Remove(ServerWindow* child); |
| 78 void Reorder(ServerWindow* relative, mojom::OrderDirection diretion); | 81 void Reorder(ServerWindow* relative, mojom::OrderDirection diretion); |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 | 265 |
| 263 base::ObserverList<ServerWindowObserver> observers_; | 266 base::ObserverList<ServerWindowObserver> observers_; |
| 264 | 267 |
| 265 DISALLOW_COPY_AND_ASSIGN(ServerWindow); | 268 DISALLOW_COPY_AND_ASSIGN(ServerWindow); |
| 266 }; | 269 }; |
| 267 | 270 |
| 268 } // namespace ws | 271 } // namespace ws |
| 269 } // namespace ui | 272 } // namespace ui |
| 270 | 273 |
| 271 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_ | 274 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_ |
| OLD | NEW |