OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_compositor_frame_sink_manager.h" | 5 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h" |
6 | 6 |
7 #include "mojo/public/cpp/bindings/strong_binding.h" | 7 #include "mojo/public/cpp/bindings/strong_binding.h" |
8 #include "services/ui/surfaces/display_compositor.h" | 8 #include "services/ui/surfaces/display_compositor.h" |
9 #include "services/ui/ws/gpu_compositor_frame_sink.h" | 9 #include "services/ui/surfaces/gpu_compositor_frame_sink.h" |
10 #include "services/ui/ws/ids.h" | 10 #include "services/ui/ws/ids.h" |
11 #include "services/ui/ws/server_window.h" | 11 #include "services/ui/ws/server_window.h" |
12 #include "services/ui/ws/server_window_delegate.h" | 12 #include "services/ui/ws/server_window_delegate.h" |
13 | 13 |
14 namespace ui { | 14 namespace ui { |
15 namespace ws { | 15 namespace ws { |
16 | 16 |
17 ServerWindowCompositorFrameSinkManager::ServerWindowCompositorFrameSinkManager( | 17 ServerWindowCompositorFrameSinkManager::ServerWindowCompositorFrameSinkManager( |
18 ServerWindow* window) | 18 ServerWindow* window) |
19 : window_(window), | 19 : window_(window), |
(...skipping 12 matching lines...) Expand all Loading... |
32 waiting_for_initial_frames_ = !IsCompositorFrameSinkReadyAndNonEmpty( | 32 waiting_for_initial_frames_ = !IsCompositorFrameSinkReadyAndNonEmpty( |
33 mojom::CompositorFrameSinkType::DEFAULT) || | 33 mojom::CompositorFrameSinkType::DEFAULT) || |
34 !IsCompositorFrameSinkReadyAndNonEmpty( | 34 !IsCompositorFrameSinkReadyAndNonEmpty( |
35 mojom::CompositorFrameSinkType::UNDERLAY); | 35 mojom::CompositorFrameSinkType::UNDERLAY); |
36 return !waiting_for_initial_frames_; | 36 return !waiting_for_initial_frames_; |
37 } | 37 } |
38 | 38 |
39 void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSink( | 39 void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSink( |
40 mojom::CompositorFrameSinkType compositor_frame_sink_type, | 40 mojom::CompositorFrameSinkType compositor_frame_sink_type, |
41 gfx::AcceleratedWidget widget, | 41 gfx::AcceleratedWidget widget, |
42 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, | |
43 scoped_refptr<SurfacesContextProvider> context_provider, | |
44 cc::mojom::MojoCompositorFrameSinkRequest request, | 42 cc::mojom::MojoCompositorFrameSinkRequest request, |
45 cc::mojom::MojoCompositorFrameSinkClientPtr client) { | 43 cc::mojom::MojoCompositorFrameSinkClientPtr client) { |
46 cc::FrameSinkId frame_sink_id( | 44 cc::FrameSinkId frame_sink_id( |
47 WindowIdToTransportId(window_->id()), | 45 WindowIdToTransportId(window_->id()), |
48 static_cast<uint32_t>(compositor_frame_sink_type)); | 46 static_cast<uint32_t>(compositor_frame_sink_type)); |
49 CompositorFrameSinkData& data = | 47 CompositorFrameSinkData& data = |
50 type_to_compositor_frame_sink_map_[compositor_frame_sink_type]; | 48 type_to_compositor_frame_sink_map_[compositor_frame_sink_type]; |
51 | |
52 cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request; | 49 cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request; |
53 if (data.pending_compositor_frame_sink_request.is_pending()) { | 50 if (data.pending_compositor_frame_sink_request.is_pending()) { |
54 private_request = std::move(data.pending_compositor_frame_sink_request); | 51 private_request = std::move(data.pending_compositor_frame_sink_request); |
55 } else { | 52 } else { |
56 private_request = mojo::GetProxy(&data.compositor_frame_sink); | 53 private_request = mojo::GetProxy(&data.compositor_frame_sink); |
57 } | 54 } |
58 | 55 |
59 // TODO(fsamuel): Create the CompositorFrameSink through the DisplayCompositor | 56 // TODO(fsamuel): AcceleratedWidget cannot be transported over IPC for Mac or |
60 // mojo interface. | 57 // Android. We should instead use GpuSurfaceTracker here on those platforms. |
61 mojo::MakeStrongBinding( | 58 window_->delegate()->GetDisplayCompositor()->CreateCompositorFrameSink( |
62 base::MakeUnique<GpuCompositorFrameSink>( | 59 frame_sink_id, widget, std::move(request), std::move(private_request), |
63 window_->delegate()->GetDisplayCompositor(), frame_sink_id, widget, | 60 std::move(client)); |
64 gpu_memory_buffer_manager, std::move(context_provider), | 61 |
65 std::move(request), std::move(client)), | |
66 std::move(private_request)); | |
67 if (window_->parent()) { | 62 if (window_->parent()) { |
68 window_->delegate() | 63 window_->delegate() |
69 ->GetRootWindow(window_) | 64 ->GetRootWindow(window_) |
70 ->GetOrCreateCompositorFrameSinkManager() | 65 ->GetOrCreateCompositorFrameSinkManager() |
71 ->AddChildFrameSinkId(mojom::CompositorFrameSinkType::DEFAULT, | 66 ->AddChildFrameSinkId(mojom::CompositorFrameSinkType::DEFAULT, |
72 frame_sink_id); | 67 frame_sink_id); |
73 } | 68 } |
74 } | 69 } |
75 | 70 |
76 void ServerWindowCompositorFrameSinkManager::AddChildFrameSinkId( | 71 void ServerWindowCompositorFrameSinkManager::AddChildFrameSinkId( |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 | 154 |
160 CompositorFrameSinkData& CompositorFrameSinkData::operator=( | 155 CompositorFrameSinkData& CompositorFrameSinkData::operator=( |
161 CompositorFrameSinkData&& other) { | 156 CompositorFrameSinkData&& other) { |
162 latest_submitted_surface_id = other.latest_submitted_surface_id; | 157 latest_submitted_surface_id = other.latest_submitted_surface_id; |
163 compositor_frame_sink = std::move(other.compositor_frame_sink); | 158 compositor_frame_sink = std::move(other.compositor_frame_sink); |
164 return *this; | 159 return *this; |
165 } | 160 } |
166 | 161 |
167 } // namespace ws | 162 } // namespace ws |
168 } // namespace ui | 163 } // namespace ui |
OLD | NEW |