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 #include "services/ui/ws/server_window.h" | 5 #include "services/ui/ws/server_window.h" |
6 | 6 |
7 #include <inttypes.h> | 7 #include <inttypes.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 | 76 |
77 void ServerWindow::RemoveObserver(ServerWindowObserver* observer) { | 77 void ServerWindow::RemoveObserver(ServerWindowObserver* observer) { |
78 DCHECK(observers_.HasObserver(observer)); | 78 DCHECK(observers_.HasObserver(observer)); |
79 observers_.RemoveObserver(observer); | 79 observers_.RemoveObserver(observer); |
80 } | 80 } |
81 | 81 |
82 bool ServerWindow::HasObserver(ServerWindowObserver* observer) { | 82 bool ServerWindow::HasObserver(ServerWindowObserver* observer) { |
83 return observers_.HasObserver(observer); | 83 return observers_.HasObserver(observer); |
84 } | 84 } |
85 | 85 |
86 void ServerWindow::CreateCompositorFrameSink( | 86 void ServerWindow::CreateDisplayCompositorFrameSink( |
87 mojom::CompositorFrameSinkType compositor_frame_sink_type, | |
88 gfx::AcceleratedWidget widget, | 87 gfx::AcceleratedWidget widget, |
89 cc::mojom::MojoCompositorFrameSinkRequest request, | 88 cc::mojom::MojoCompositorFrameSinkRequest request, |
90 cc::mojom::MojoCompositorFrameSinkClientPtr client) { | 89 cc::mojom::MojoCompositorFrameSinkClientPtr client) { |
91 GetOrCreateCompositorFrameSinkManager()->CreateCompositorFrameSink( | 90 GetOrCreateCompositorFrameSinkManager()->CreateDisplayCompositorFrameSink( |
92 compositor_frame_sink_type, widget, std::move(request), | 91 widget, std::move(request), std::move(client)); |
93 std::move(client)); | 92 } |
| 93 |
| 94 void ServerWindow::CreateOffscreenCompositorFrameSink( |
| 95 mojom::CompositorFrameSinkType compositor_frame_sink_type, |
| 96 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 97 cc::mojom::MojoCompositorFrameSinkClientPtr client) { |
| 98 GetOrCreateCompositorFrameSinkManager()->CreateOffscreenCompositorFrameSink( |
| 99 compositor_frame_sink_type, std::move(request), std::move(client)); |
94 } | 100 } |
95 | 101 |
96 void ServerWindow::Add(ServerWindow* child) { | 102 void ServerWindow::Add(ServerWindow* child) { |
97 // We assume validation checks happened already. | 103 // We assume validation checks happened already. |
98 DCHECK(child); | 104 DCHECK(child); |
99 DCHECK(child != this); | 105 DCHECK(child != this); |
100 DCHECK(!child->Contains(this)); | 106 DCHECK(!child->Contains(this)); |
101 if (child->parent() == this) { | 107 if (child->parent() == this) { |
102 if (children_.size() == 1) | 108 if (children_.size() == 1) |
103 return; // Already in the right position. | 109 return; // Already in the right position. |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
456 } | 462 } |
457 | 463 |
458 // static | 464 // static |
459 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { | 465 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { |
460 return &window->stacking_target_; | 466 return &window->stacking_target_; |
461 } | 467 } |
462 | 468 |
463 } // namespace ws | 469 } // namespace ws |
464 | 470 |
465 } // namespace ui | 471 } // namespace ui |
OLD | NEW |