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 "ui/views/mus/surface_context_factory.h" | 5 #include "ui/views/mus/surface_context_factory.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "cc/output/output_surface.h" | 8 #include "cc/output/output_surface.h" |
9 #include "cc/resources/shared_bitmap_manager.h" | 9 #include "cc/resources/shared_bitmap_manager.h" |
10 #include "cc/surfaces/surface_id_allocator.h" | 10 #include "cc/surfaces/surface_id_allocator.h" |
| 11 #include "services/ui/public/cpp/compositor_frame_sink.h" |
11 #include "services/ui/public/cpp/gpu_service.h" | 12 #include "services/ui/public/cpp/gpu_service.h" |
12 #include "services/ui/public/cpp/output_surface.h" | |
13 #include "services/ui/public/cpp/window.h" | 13 #include "services/ui/public/cpp/window.h" |
14 #include "ui/compositor/reflector.h" | 14 #include "ui/compositor/reflector.h" |
15 #include "ui/gl/gl_bindings.h" | 15 #include "ui/gl/gl_bindings.h" |
16 #include "ui/views/mus/native_widget_mus.h" | 16 #include "ui/views/mus/native_widget_mus.h" |
17 | 17 |
18 namespace views { | 18 namespace views { |
19 namespace { | 19 namespace { |
20 | 20 |
21 class FakeReflector : public ui::Reflector { | 21 class FakeReflector : public ui::Reflector { |
22 public: | 22 public: |
23 FakeReflector() {} | 23 FakeReflector() {} |
24 ~FakeReflector() override {} | 24 ~FakeReflector() override {} |
25 void OnMirroringCompositorResized() override {} | 25 void OnMirroringCompositorResized() override {} |
26 void AddMirroringLayer(ui::Layer* layer) override {} | 26 void AddMirroringLayer(ui::Layer* layer) override {} |
27 void RemoveMirroringLayer(ui::Layer* layer) override {} | 27 void RemoveMirroringLayer(ui::Layer* layer) override {} |
28 }; | 28 }; |
29 | 29 |
30 } // namespace | 30 } // namespace |
31 | 31 |
32 SurfaceContextFactory::SurfaceContextFactory(ui::GpuService* gpu_service) | 32 SurfaceContextFactory::SurfaceContextFactory(ui::GpuService* gpu_service) |
33 : next_surface_id_namespace_(1u), gpu_service_(gpu_service) {} | 33 : next_surface_id_namespace_(1u), gpu_service_(gpu_service) {} |
34 | 34 |
35 SurfaceContextFactory::~SurfaceContextFactory() {} | 35 SurfaceContextFactory::~SurfaceContextFactory() {} |
36 | 36 |
37 void SurfaceContextFactory::CreateOutputSurface( | 37 void SurfaceContextFactory::CreateCompositorFrameSink( |
38 base::WeakPtr<ui::Compositor> compositor) { | 38 base::WeakPtr<ui::Compositor> compositor) { |
39 ui::Window* window = compositor->window(); | 39 ui::Window* window = compositor->window(); |
40 NativeWidgetMus* native_widget = NativeWidgetMus::GetForWindow(window); | 40 NativeWidgetMus* native_widget = NativeWidgetMus::GetForWindow(window); |
41 ui::mojom::SurfaceType surface_type = native_widget->surface_type(); | 41 ui::mojom::SurfaceType surface_type = native_widget->surface_type(); |
42 std::unique_ptr<cc::OutputSurface> surface( | 42 auto compositor_frame_sink = base::MakeUnique<ui::CompositorFrameSink>( |
43 new ui::OutputSurface(gpu_service_->EstablishGpuChannelSync(), | 43 gpu_service_->EstablishGpuChannelSync(), |
44 window->RequestSurface(surface_type))); | 44 window->RequestSurface(surface_type)); |
45 compositor->SetOutputSurface(std::move(surface)); | 45 compositor->SetCompositorFrameSink(std::move(compositor_frame_sink)); |
46 } | 46 } |
47 | 47 |
48 std::unique_ptr<ui::Reflector> SurfaceContextFactory::CreateReflector( | 48 std::unique_ptr<ui::Reflector> SurfaceContextFactory::CreateReflector( |
49 ui::Compositor* mirroed_compositor, | 49 ui::Compositor* mirroed_compositor, |
50 ui::Layer* mirroring_layer) { | 50 ui::Layer* mirroring_layer) { |
51 // NOTIMPLEMENTED(); | 51 // NOTIMPLEMENTED(); |
52 return base::WrapUnique(new FakeReflector); | 52 return base::WrapUnique(new FakeReflector); |
53 } | 53 } |
54 | 54 |
55 void SurfaceContextFactory::RemoveReflector(ui::Reflector* reflector) { | 55 void SurfaceContextFactory::RemoveReflector(ui::Reflector* reflector) { |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 bool visible) { | 102 bool visible) { |
103 // TODO(fsamuel): display[compositor]->SetVisible(visible); | 103 // TODO(fsamuel): display[compositor]->SetVisible(visible); |
104 } | 104 } |
105 | 105 |
106 void SurfaceContextFactory::ResizeDisplay(ui::Compositor* compositor, | 106 void SurfaceContextFactory::ResizeDisplay(ui::Compositor* compositor, |
107 const gfx::Size& size) { | 107 const gfx::Size& size) { |
108 // TODO(fsamuel): display[compositor]->Resize(size); | 108 // TODO(fsamuel): display[compositor]->Resize(size); |
109 } | 109 } |
110 | 110 |
111 } // namespace views | 111 } // namespace views |
OLD | NEW |