Chromium Code Reviews| 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 24 matching lines...) Expand all Loading... | |
| 51 const WindowId& id, | 52 const WindowId& id, |
| 52 const Properties& properties); | 53 const Properties& properties); |
| 53 ~ServerWindow(); | 54 ~ServerWindow(); |
| 54 | 55 |
| 55 void AddObserver(ServerWindowObserver* observer); | 56 void AddObserver(ServerWindowObserver* observer); |
| 56 void RemoveObserver(ServerWindowObserver* observer); | 57 void RemoveObserver(ServerWindowObserver* observer); |
| 57 bool HasObserver(ServerWindowObserver* observer); | 58 bool HasObserver(ServerWindowObserver* observer); |
| 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 |
|
msw
2016/12/19 20:18:11
tangential q: this TODO seems out of date; should
Fady Samuel
2016/12/19 20:20:18
Yes, this TODO was addressed a while ago and can b
Alex Z.
2016/12/19 20:53:29
Done.
| |
| 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, |
|
msw
2016/12/19 20:18:11
tangential q: Shouldn't this file #include "cc/ipc
Fady Samuel
2016/12/19 20:20:18
+1
Alex Z.
2016/12/19 20:53:29
Done.
| |
| 70 cc::mojom::DisplayPrivateRequest display_private_request); | |
| 69 void CreateOffscreenCompositorFrameSink( | 71 void CreateOffscreenCompositorFrameSink( |
| 70 mojom::CompositorFrameSinkType compositor_frame_sink_type, | 72 mojom::CompositorFrameSinkType compositor_frame_sink_type, |
| 71 cc::mojom::MojoCompositorFrameSinkRequest request, | 73 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 72 cc::mojom::MojoCompositorFrameSinkClientPtr client); | 74 cc::mojom::MojoCompositorFrameSinkClientPtr client); |
| 73 | 75 |
| 74 const WindowId& id() const { return id_; } | 76 const WindowId& id() const { return id_; } |
| 75 | 77 |
| 76 void Add(ServerWindow* child); | 78 void Add(ServerWindow* child); |
| 77 void Remove(ServerWindow* child); | 79 void Remove(ServerWindow* child); |
| 78 void Reorder(ServerWindow* relative, mojom::OrderDirection diretion); | 80 void Reorder(ServerWindow* relative, mojom::OrderDirection diretion); |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 268 | 270 |
| 269 base::ObserverList<ServerWindowObserver> observers_; | 271 base::ObserverList<ServerWindowObserver> observers_; |
| 270 | 272 |
| 271 DISALLOW_COPY_AND_ASSIGN(ServerWindow); | 273 DISALLOW_COPY_AND_ASSIGN(ServerWindow); |
| 272 }; | 274 }; |
| 273 | 275 |
| 274 } // namespace ws | 276 } // namespace ws |
| 275 } // namespace ui | 277 } // namespace ui |
| 276 | 278 |
| 277 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_ | 279 #endif // SERVICES_UI_WS_SERVER_WINDOW_H_ |
| OLD | NEW |