| 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> |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 void AddObserver(ServerWindowObserver* observer); | 55 void AddObserver(ServerWindowObserver* observer); |
| 56 void RemoveObserver(ServerWindowObserver* observer); | 56 void RemoveObserver(ServerWindowObserver* observer); |
| 57 bool HasObserver(ServerWindowObserver* observer); | 57 bool HasObserver(ServerWindowObserver* observer); |
| 58 | 58 |
| 59 // Creates a new CompositorFrameSink of the specified type, replacing the | 59 // Creates a new CompositorFrameSink of the specified type, replacing the |
| 60 // existing. | 60 // existing. |
| 61 // TODO(fsamuel): We should not be passing in |gpu_memory_buffer_manager| and | 61 // 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. | 62 // |context_provider|. The window server should not know anything about them. |
| 63 // Instead, they should be a CompositorFrameSink service-side implementation | 63 // Instead, they should be a CompositorFrameSink service-side implementation |
| 64 // detail. | 64 // detail. |
| 65 void CreateCompositorFrameSink( | 65 void CreateDisplayCompositorFrameSink( |
| 66 gfx::AcceleratedWidget widget, |
| 67 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 68 cc::mojom::MojoCompositorFrameSinkClientPtr client); |
| 69 void CreateOffscreenCompositorFrameSink( |
| 66 mojom::CompositorFrameSinkType compositor_frame_sink_type, | 70 mojom::CompositorFrameSinkType compositor_frame_sink_type, |
| 67 gfx::AcceleratedWidget widget, | |
| 68 cc::mojom::MojoCompositorFrameSinkRequest request, | 71 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 69 cc::mojom::MojoCompositorFrameSinkClientPtr client); | 72 cc::mojom::MojoCompositorFrameSinkClientPtr client); |
| 70 | 73 |
| 71 const WindowId& id() const { return id_; } | 74 const WindowId& id() const { return id_; } |
| 72 | 75 |
| 73 void Add(ServerWindow* child); | 76 void Add(ServerWindow* child); |
| 74 void Remove(ServerWindow* child); | 77 void Remove(ServerWindow* child); |
| 75 void Reorder(ServerWindow* relative, mojom::OrderDirection diretion); | 78 void Reorder(ServerWindow* relative, mojom::OrderDirection diretion); |
| 76 void StackChildAtBottom(ServerWindow* child); | 79 void StackChildAtBottom(ServerWindow* child); |
| 77 void StackChildAtTop(ServerWindow* child); | 80 void StackChildAtTop(ServerWindow* child); |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 | 262 |
| 260 base::ObserverList<ServerWindowObserver> observers_; | 263 base::ObserverList<ServerWindowObserver> observers_; |
| 261 | 264 |
| 262 DISALLOW_COPY_AND_ASSIGN(ServerWindow); | 265 DISALLOW_COPY_AND_ASSIGN(ServerWindow); |
| 263 }; | 266 }; |
| 264 | 267 |
| 265 } // namespace ws | 268 } // namespace ws |
| 266 } // namespace ui | 269 } // namespace ui |
| 267 | 270 |
| 268 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_ | 271 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_ |
| OLD | NEW |