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

Side by Side Diff: components/view_manager/surfaces/display_impl.cc

Issue 1245683004: Mandoline: Merge Surfaces and Views apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Rob's comments Created 5 years, 4 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 2015 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/view_manager/surfaces/display_impl.h"
6
7 #include "cc/output/compositor_frame.h"
8 #include "cc/surfaces/display.h"
9 #include "components/view_manager/surfaces/surfaces_context_provider.h"
10 #include "components/view_manager/surfaces/surfaces_output_surface.h"
11 #include "components/view_manager/surfaces/surfaces_scheduler.h"
12 #include "components/view_manager/surfaces/surfaces_service_application.h"
13 #include "mojo/converters/geometry/geometry_type_converters.h"
14 #include "mojo/converters/surfaces/surfaces_type_converters.h"
15
16 namespace surfaces {
17 namespace {
18 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
19 callback.Run();
20 }
21 }
22
23 DisplayImpl::DisplayImpl(SurfacesServiceApplication* application,
24 cc::SurfaceManager* manager,
25 cc::SurfaceId cc_id,
26 SurfacesScheduler* scheduler,
27 mojo::ContextProviderPtr context_provider,
28 mojo::ResourceReturnerPtr returner,
29 mojo::InterfaceRequest<mojo::Display> display_request)
30 : application_(application),
31 manager_(manager),
32 factory_(manager, this),
33 cc_id_(cc_id),
34 scheduler_(scheduler),
35 context_provider_(context_provider.Pass()),
36 returner_(returner.Pass()),
37 viewport_param_binding_(this),
38 display_binding_(this, display_request.Pass()) {
39 application_->DisplayCreated(this);
40 mojo::ViewportParameterListenerPtr viewport_parameter_listener;
41 viewport_param_binding_.Bind(GetProxy(&viewport_parameter_listener));
42 context_provider_->Create(
43 viewport_parameter_listener.Pass(),
44 base::Bind(&DisplayImpl::OnContextCreated, base::Unretained(this)));
45 factory_.Create(cc_id_);
46 }
47
48 void DisplayImpl::OnContextCreated(mojo::CommandBufferPtr gles2_client) {
49 DCHECK(!display_);
50
51 cc::RendererSettings settings;
52 display_.reset(new cc::Display(this, manager_, nullptr, nullptr, settings));
53 scheduler_->AddDisplay(display_.get());
54
55 // TODO(brianderson): Reconcile with SurfacesScheduler crbug.com/476676
56 cc::DisplayScheduler* null_display_scheduler = nullptr;
57 display_->Initialize(make_scoped_ptr(new surfaces::DirectOutputSurface(
58 new surfaces::SurfacesContextProvider(
59 gles2_client.PassInterface().PassHandle()))),
60 null_display_scheduler);
61 display_->Resize(last_submitted_frame_size_);
62
63 display_->SetSurfaceId(cc_id_, 1.f);
64 if (pending_frame_)
65 Draw();
66 }
67
68 DisplayImpl::~DisplayImpl() {
69 if (display_) {
70 factory_.Destroy(cc_id_);
71 scheduler_->RemoveDisplay(display_.get());
72 // By deleting the object after display_ is reset, OutputSurfaceLost can
73 // know not to do anything (which would result in double delete).
74 delete display_.release();
75 }
76 application_->DisplayDestroyed(this);
77 }
78
79 void DisplayImpl::SubmitFrame(mojo::FramePtr frame,
80 const SubmitFrameCallback& callback) {
81 DCHECK(pending_callback_.is_null());
82 pending_frame_ = frame.Pass();
83 pending_callback_ = callback;
84 if (display_)
85 Draw();
86 }
87
88 void DisplayImpl::Draw() {
89 gfx::Size frame_size =
90 pending_frame_->passes[0]->output_rect.To<gfx::Rect>().size();
91 last_submitted_frame_size_ = frame_size;
92 display_->Resize(frame_size);
93 factory_.SubmitFrame(cc_id_,
94 pending_frame_.To<scoped_ptr<cc::CompositorFrame>>(),
95 base::Bind(&CallCallback, pending_callback_));
96 pending_frame_.reset();
97 scheduler_->SetNeedsDraw();
98 pending_callback_.reset();
99 }
100
101 void DisplayImpl::CommitVSyncParameters(base::TimeTicks timebase,
102 base::TimeDelta interval) {
103 }
104
105 void DisplayImpl::OutputSurfaceLost() {
106 if (!display_) // Shutdown case
107 return;
108
109 // If our OutputSurface is lost we can't draw until we get a new one. For now,
110 // destroy the display and create a new one when our ContextProvider provides
111 // a new one.
112 // TODO: This is more violent than necessary - we could simply remove this
113 // display from the scheduler's set and pass a new context in to the
114 // OutputSurface. It should be able to reinitialize properly.
115 scheduler_->RemoveDisplay(display_.get());
116 display_.reset();
117 viewport_param_binding_.Close();
118 mojo::ViewportParameterListenerPtr viewport_parameter_listener;
119 viewport_param_binding_.Bind(GetProxy(&viewport_parameter_listener));
120 context_provider_->Create(
121 viewport_parameter_listener.Pass(),
122 base::Bind(&DisplayImpl::OnContextCreated, base::Unretained(this)));
123 }
124
125 void DisplayImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) {
126 }
127
128 void DisplayImpl::OnVSyncParametersUpdated(int64_t timebase, int64_t interval) {
129 scheduler_->OnVSyncParametersUpdated(
130 base::TimeTicks::FromInternalValue(timebase),
131 base::TimeDelta::FromInternalValue(interval));
132 }
133
134 void DisplayImpl::ReturnResources(const cc::ReturnedResourceArray& resources) {
135 if (resources.empty())
136 return;
137 DCHECK(returner_);
138
139 mojo::Array<mojo::ReturnedResourcePtr> ret(resources.size());
140 for (size_t i = 0; i < resources.size(); ++i) {
141 ret[i] = mojo::ReturnedResource::From(resources[i]);
142 }
143 returner_->ReturnResources(ret.Pass());
144 }
145
146 } // namespace surfaces
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698