| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 observers_.RemoveObserver(observer); | 78 observers_.RemoveObserver(observer); |
| 79 } | 79 } |
| 80 | 80 |
| 81 bool ServerWindow::HasObserver(ServerWindowObserver* observer) { | 81 bool ServerWindow::HasObserver(ServerWindowObserver* observer) { |
| 82 return observers_.HasObserver(observer); | 82 return observers_.HasObserver(observer); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void ServerWindow::CreateDisplayCompositorFrameSink( | 85 void ServerWindow::CreateDisplayCompositorFrameSink( |
| 86 gfx::AcceleratedWidget widget, | 86 gfx::AcceleratedWidget widget, |
| 87 cc::mojom::MojoCompositorFrameSinkRequest request, | 87 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 88 cc::mojom::MojoCompositorFrameSinkClientPtr client) { | 88 cc::mojom::MojoCompositorFrameSinkClientPtr client, |
| 89 cc::mojom::DisplayPrivateRequest display_private_request) { |
| 89 GetOrCreateCompositorFrameSinkManager()->CreateDisplayCompositorFrameSink( | 90 GetOrCreateCompositorFrameSinkManager()->CreateDisplayCompositorFrameSink( |
| 90 widget, std::move(request), std::move(client)); | 91 widget, std::move(request), std::move(client), |
| 92 std::move(display_private_request)); |
| 91 } | 93 } |
| 92 | 94 |
| 93 void ServerWindow::CreateOffscreenCompositorFrameSink( | 95 void ServerWindow::CreateOffscreenCompositorFrameSink( |
| 94 mojom::CompositorFrameSinkType compositor_frame_sink_type, | 96 mojom::CompositorFrameSinkType compositor_frame_sink_type, |
| 95 cc::mojom::MojoCompositorFrameSinkRequest request, | 97 cc::mojom::MojoCompositorFrameSinkRequest request, |
| 96 cc::mojom::MojoCompositorFrameSinkClientPtr client) { | 98 cc::mojom::MojoCompositorFrameSinkClientPtr client) { |
| 97 GetOrCreateCompositorFrameSinkManager()->CreateOffscreenCompositorFrameSink( | 99 GetOrCreateCompositorFrameSinkManager()->CreateOffscreenCompositorFrameSink( |
| 98 compositor_frame_sink_type, std::move(request), std::move(client)); | 100 compositor_frame_sink_type, std::move(request), std::move(client)); |
| 99 } | 101 } |
| 100 | 102 |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 window->OnStackingChanged(); | 476 window->OnStackingChanged(); |
| 475 } | 477 } |
| 476 | 478 |
| 477 // static | 479 // static |
| 478 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { | 480 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) { |
| 479 return &window->stacking_target_; | 481 return &window->stacking_target_; |
| 480 } | 482 } |
| 481 | 483 |
| 482 } // namespace ws | 484 } // namespace ws |
| 483 } // namespace ui | 485 } // namespace ui |
| OLD | NEW |