OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/frame_generator.h" | 5 #include "services/ui/ws/frame_generator.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/containers/adapters.h" | 9 #include "base/containers/adapters.h" |
10 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 RemoveAllSurfaceReferences(); | 34 RemoveAllSurfaceReferences(); |
35 // Invalidate WeakPtrs now to avoid callbacks back into the | 35 // Invalidate WeakPtrs now to avoid callbacks back into the |
36 // FrameGenerator during destruction of |compositor_frame_sink_|. | 36 // FrameGenerator during destruction of |compositor_frame_sink_|. |
37 weak_factory_.InvalidateWeakPtrs(); | 37 weak_factory_.InvalidateWeakPtrs(); |
38 compositor_frame_sink_.reset(); | 38 compositor_frame_sink_.reset(); |
39 } | 39 } |
40 | 40 |
41 void FrameGenerator::OnAcceleratedWidgetAvailable( | 41 void FrameGenerator::OnAcceleratedWidgetAvailable( |
42 gfx::AcceleratedWidget widget) { | 42 gfx::AcceleratedWidget widget) { |
43 DCHECK_NE(gfx::kNullAcceleratedWidget, widget); | 43 DCHECK_NE(gfx::kNullAcceleratedWidget, widget); |
44 cc::mojom::MojoCompositorFrameSinkRequest request = | 44 cc::mojom::MojoCompositorFrameSinkRequest request(&compositor_frame_sink_); |
45 mojo::MakeRequest(&compositor_frame_sink_); | |
46 root_window_->CreateDisplayCompositorFrameSink( | 45 root_window_->CreateDisplayCompositorFrameSink( |
47 widget, std::move(request), binding_.CreateInterfacePtrAndBind()); | 46 widget, std::move(request), binding_.CreateInterfacePtrAndBind()); |
48 // TODO(fsamuel): This means we're always requesting a new BeginFrame signal | 47 // TODO(fsamuel): This means we're always requesting a new BeginFrame signal |
49 // even when we don't need it. Once surface ID propagation work is done, | 48 // even when we don't need it. Once surface ID propagation work is done, |
50 // this will not be necessary because FrameGenerator will only need a | 49 // this will not be necessary because FrameGenerator will only need a |
51 // BeginFrame if the window manager changes. | 50 // BeginFrame if the window manager changes. |
52 compositor_frame_sink_->SetNeedsBeginFrame(true); | 51 compositor_frame_sink_->SetNeedsBeginFrame(true); |
53 } | 52 } |
54 | 53 |
55 void FrameGenerator::OnSurfaceCreated(const cc::SurfaceId& surface_id, | 54 void FrameGenerator::OnSurfaceCreated(const cc::SurfaceId& surface_id, |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 cc::SurfaceId underlay_surface_id = | 340 cc::SurfaceId underlay_surface_id = |
342 window->compositor_frame_sink_manager()->GetLatestSurfaceId( | 341 window->compositor_frame_sink_manager()->GetLatestSurfaceId( |
343 mojom::CompositorFrameSinkType::UNDERLAY); | 342 mojom::CompositorFrameSinkType::UNDERLAY); |
344 if (underlay_surface_id.is_valid()) | 343 if (underlay_surface_id.is_valid()) |
345 RemoveFrameSinkReference(underlay_surface_id.frame_sink_id()); | 344 RemoveFrameSinkReference(underlay_surface_id.frame_sink_id()); |
346 } | 345 } |
347 | 346 |
348 } // namespace ws | 347 } // namespace ws |
349 | 348 |
350 } // namespace ui | 349 } // namespace ui |
OLD | NEW |