Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: components/mus/surfaces/display_compositor.cc

Issue 1976663003: Pull parts of TopLevelDisplayClient into DisplayCompositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Rob's comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "components/mus/surfaces/display_compositor.h"
6
7 #include "cc/output/copy_output_request.h"
8 #include "cc/output/output_surface.h"
9 #include "cc/output/renderer_settings.h"
10 #include "cc/surfaces/display.h"
11 #include "components/mus/surfaces/direct_output_surface.h"
12 #include "components/mus/surfaces/surfaces_context_provider.h"
13 #include "components/mus/surfaces/top_level_display_client.h"
14
15 #if defined(USE_OZONE)
16 #include "components/mus/surfaces/direct_output_surface_ozone.h"
17 #include "gpu/command_buffer/client/gles2_interface.h"
18 #endif
19
20 namespace mus {
21
22 DisplayCompositor::DisplayCompositor(
23 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
24 gfx::AcceleratedWidget widget,
25 const scoped_refptr<GpuState>& gpu_state,
26 const scoped_refptr<SurfacesState>& surfaces_state)
27 : task_runner_(task_runner),
28 surfaces_state_(surfaces_state),
29 factory_(surfaces_state->manager(), this),
30 allocator_(surfaces_state->next_id_namespace()) {
31 surfaces_state_->manager()->RegisterSurfaceFactoryClient(
32 allocator_.id_namespace(), this);
33
34 scoped_refptr<SurfacesContextProvider> surfaces_context_provider(
35 new SurfacesContextProvider(widget, gpu_state));
36 // TODO(rjkroege): If there is something better to do than CHECK, add it.
37 CHECK(surfaces_context_provider->BindToCurrentThread());
38
39 std::unique_ptr<cc::OutputSurface> output_surface;
40 if (surfaces_context_provider->ContextCapabilities().surfaceless) {
41 #if defined(USE_OZONE)
42 output_surface = base::WrapUnique(new DirectOutputSurfaceOzone(
43 surfaces_context_provider, widget, task_runner_.get(), GL_TEXTURE_2D,
44 GL_RGB));
45 #else
46 NOTREACHED();
47 #endif
48 } else {
49 output_surface = base::WrapUnique(
50 new DirectOutputSurface(surfaces_context_provider, task_runner_.get()));
51 }
52
53 int max_frames_pending = output_surface->capabilities().max_frames_pending;
54 DCHECK_GT(max_frames_pending, 0);
55
56 display_client_.reset(new TopLevelDisplayClient(
57 std::move(output_surface), surfaces_state_->manager(),
58 nullptr /* bitmap_manager */, nullptr /* gpu_memory_buffer_manager */,
59 cc::RendererSettings(), task_runner_, allocator_.id_namespace()));
60
61 display_client_->Initialize();
62 }
63
64 DisplayCompositor::~DisplayCompositor() {
65 surfaces_state_->manager()->UnregisterSurfaceFactoryClient(
66 allocator_.id_namespace());
67 }
68
69 void DisplayCompositor::SubmitCompositorFrame(
70 std::unique_ptr<cc::CompositorFrame> frame,
71 const base::Callback<void(cc::SurfaceDrawStatus)>& callback) {
72 gfx::Size frame_size =
73 frame->delegated_frame_data->render_pass_list.back()->output_rect.size();
74 if (frame_size.IsEmpty() || frame_size != display_size_) {
75 if (!surface_id_.is_null())
76 factory_.Destroy(surface_id_);
77 surface_id_ = allocator_.GenerateId();
78 factory_.Create(surface_id_);
79 display_size_ = frame_size;
80 display_client_->display()->Resize(display_size_);
81 }
82 display_client_->display()->SetSurfaceId(surface_id_,
83 frame->metadata.device_scale_factor);
84 factory_.SubmitCompositorFrame(surface_id_, std::move(frame), callback);
85 }
86
87 void DisplayCompositor::RequestCopyOfOutput(
88 std::unique_ptr<cc::CopyOutputRequest> output_request) {
89 factory_.RequestCopyOfSurface(surface_id_, std::move(output_request));
90 }
91
92 void DisplayCompositor::ReturnResources(
93 const cc::ReturnedResourceArray& resources) {
94 // TODO(fsamuel): Implement this.
95 }
96
97 void DisplayCompositor::SetBeginFrameSource(
98 cc::BeginFrameSource* begin_frame_source) {
99 // TODO(fsamuel): Implement this.
100 }
101
102 } // namespace mus
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698