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

Side by Side Diff: cc/surfaces/display.cc

Issue 1057283003: Remove parts of //cc we aren't using (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « cc/surfaces/display.h ('k') | cc/surfaces/display_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "cc/surfaces/display.h" 5 #include "cc/surfaces/display.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
9 #include "cc/debug/benchmark_instrumentation.h"
10 #include "cc/output/compositor_frame.h" 9 #include "cc/output/compositor_frame.h"
11 #include "cc/output/compositor_frame_ack.h" 10 #include "cc/output/compositor_frame_ack.h"
12 #include "cc/output/direct_renderer.h" 11 #include "cc/output/direct_renderer.h"
13 #include "cc/output/gl_renderer.h" 12 #include "cc/output/gl_renderer.h"
14 #include "cc/output/renderer_settings.h" 13 #include "cc/output/renderer_settings.h"
15 #include "cc/output/software_renderer.h" 14 #include "cc/output/software_renderer.h"
16 #include "cc/resources/texture_mailbox_deleter.h" 15 #include "cc/resources/texture_mailbox_deleter.h"
17 #include "cc/surfaces/display_client.h" 16 #include "cc/surfaces/display_client.h"
18 #include "cc/surfaces/surface.h" 17 #include "cc/surfaces/surface.h"
19 #include "cc/surfaces/surface_aggregator.h" 18 #include "cc/surfaces/surface_aggregator.h"
20 #include "cc/surfaces/surface_manager.h" 19 #include "cc/surfaces/surface_manager.h"
21 #include "cc/trees/blocking_task_runner.h"
22 20
23 namespace cc { 21 namespace cc {
24 22
25 Display::Display(DisplayClient* client, 23 Display::Display(DisplayClient* client,
26 SurfaceManager* manager, 24 SurfaceManager* manager,
27 SharedBitmapManager* bitmap_manager, 25 SharedBitmapManager* bitmap_manager,
28 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 26 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
29 const RendererSettings& settings) 27 const RendererSettings& settings)
30 : client_(client), 28 : client_(client),
31 manager_(manager), 29 manager_(manager),
32 bitmap_manager_(bitmap_manager), 30 bitmap_manager_(bitmap_manager),
33 gpu_memory_buffer_manager_(gpu_memory_buffer_manager), 31 gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
34 settings_(settings), 32 settings_(settings),
35 device_scale_factor_(1.f), 33 device_scale_factor_(1.f),
36 blocking_main_thread_task_runner_(
37 BlockingTaskRunner::Create(base::MessageLoopProxy::current())),
38 texture_mailbox_deleter_( 34 texture_mailbox_deleter_(
39 new TextureMailboxDeleter(base::MessageLoopProxy::current())) { 35 new TextureMailboxDeleter(base::MessageLoopProxy::current())) {
40 manager_->AddObserver(this); 36 manager_->AddObserver(this);
41 } 37 }
42 38
43 Display::~Display() { 39 Display::~Display() {
44 manager_->RemoveObserver(this); 40 manager_->RemoveObserver(this);
45 if (aggregator_) { 41 if (aggregator_) {
46 for (const auto& id_entry : aggregator_->previous_contained_surfaces()) { 42 for (const auto& id_entry : aggregator_->previous_contained_surfaces()) {
47 Surface* surface = manager_->GetSurfaceForId(id_entry.first); 43 Surface* surface = manager_->GetSurfaceForId(id_entry.first);
(...skipping 24 matching lines...) Expand all
72 current_surface_size_ = size; 68 current_surface_size_ = size;
73 client_->DisplayDamaged(); 69 client_->DisplayDamaged();
74 } 70 }
75 71
76 void Display::InitializeRenderer() { 72 void Display::InitializeRenderer() {
77 if (resource_provider_) 73 if (resource_provider_)
78 return; 74 return;
79 75
80 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( 76 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create(
81 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, 77 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
82 blocking_main_thread_task_runner_.get(), settings_.highp_threshold_min, 78 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures,
83 settings_.use_rgba_4444_textures,
84 settings_.texture_id_allocation_chunk_size); 79 settings_.texture_id_allocation_chunk_size);
85 if (!resource_provider) 80 if (!resource_provider)
86 return; 81 return;
87 82
88 if (output_surface_->context_provider()) { 83 if (output_surface_->context_provider()) {
89 scoped_ptr<GLRenderer> renderer = GLRenderer::Create( 84 scoped_ptr<GLRenderer> renderer = GLRenderer::Create(
90 this, &settings_, output_surface_.get(), resource_provider.get(), 85 this, &settings_, output_surface_.get(), resource_provider.get(),
91 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); 86 texture_mailbox_deleter_.get(), settings_.highp_threshold_min);
92 if (!renderer) 87 if (!renderer)
93 return; 88 return;
(...skipping 23 matching lines...) Expand all
117 return false; 112 return false;
118 113
119 // TODO(skyostil): We should hold a BlockingTaskRunner::CapturePostTasks 114 // TODO(skyostil): We should hold a BlockingTaskRunner::CapturePostTasks
120 // while Aggregate is called to immediately run release callbacks afterward. 115 // while Aggregate is called to immediately run release callbacks afterward.
121 scoped_ptr<CompositorFrame> frame = 116 scoped_ptr<CompositorFrame> frame =
122 aggregator_->Aggregate(current_surface_id_); 117 aggregator_->Aggregate(current_surface_id_);
123 if (!frame) 118 if (!frame)
124 return false; 119 return false;
125 120
126 TRACE_EVENT0("cc", "Display::Draw"); 121 TRACE_EVENT0("cc", "Display::Draw");
127 benchmark_instrumentation::IssueDisplayRenderingStatsEvent();
128 122
129 // Run callbacks early to allow pipelining. 123 // Run callbacks early to allow pipelining.
130 for (const auto& id_entry : aggregator_->previous_contained_surfaces()) { 124 for (const auto& id_entry : aggregator_->previous_contained_surfaces()) {
131 Surface* surface = manager_->GetSurfaceForId(id_entry.first); 125 Surface* surface = manager_->GetSurfaceForId(id_entry.first);
132 if (surface) 126 if (surface)
133 surface->RunDrawCallbacks(SurfaceDrawStatus::DRAWN); 127 surface->RunDrawCallbacks(SurfaceDrawStatus::DRAWN);
134 } 128 }
135 DelegatedFrameData* frame_data = frame->delegated_frame_data.get(); 129 DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
136 130
137 frame->metadata.latency_info.insert(frame->metadata.latency_info.end(), 131 frame->metadata.latency_info.insert(frame->metadata.latency_info.end(),
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 179
186 void Display::DidSwapBuffersComplete() { 180 void Display::DidSwapBuffersComplete() {
187 client_->DidSwapBuffersComplete(); 181 client_->DidSwapBuffersComplete();
188 } 182 }
189 183
190 void Display::CommitVSyncParameters(base::TimeTicks timebase, 184 void Display::CommitVSyncParameters(base::TimeTicks timebase,
191 base::TimeDelta interval) { 185 base::TimeDelta interval) {
192 client_->CommitVSyncParameters(timebase, interval); 186 client_->CommitVSyncParameters(timebase, interval);
193 } 187 }
194 188
195 void Display::SetMemoryPolicy(const ManagedMemoryPolicy& policy) {
196 client_->SetMemoryPolicy(policy);
197 }
198
199 void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) { 189 void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) {
200 if (aggregator_ && 190 if (aggregator_ &&
201 aggregator_->previous_contained_surfaces().count(surface_id)) { 191 aggregator_->previous_contained_surfaces().count(surface_id)) {
202 Surface* surface = manager_->GetSurfaceForId(surface_id); 192 Surface* surface = manager_->GetSurfaceForId(surface_id);
203 if (surface) { 193 if (surface) {
204 const CompositorFrame* current_frame = surface->GetEligibleFrame(); 194 const CompositorFrame* current_frame = surface->GetEligibleFrame();
205 if (!current_frame || !current_frame->delegated_frame_data || 195 if (!current_frame || !current_frame->delegated_frame_data ||
206 !current_frame->delegated_frame_data->resource_list.size()) 196 !current_frame->delegated_frame_data->resource_list.size())
207 aggregator_->ReleaseResources(surface_id); 197 aggregator_->ReleaseResources(surface_id);
208 } 198 }
(...skipping 11 matching lines...) Expand all
220 210
221 int Display::GetMaxFramesPending() { 211 int Display::GetMaxFramesPending() {
222 int max_frames_pending = 212 int max_frames_pending =
223 output_surface_ ? output_surface_->capabilities().max_frames_pending : 0; 213 output_surface_ ? output_surface_->capabilities().max_frames_pending : 0;
224 if (max_frames_pending <= 0) 214 if (max_frames_pending <= 0)
225 max_frames_pending = OutputSurface::DEFAULT_MAX_FRAMES_PENDING; 215 max_frames_pending = OutputSurface::DEFAULT_MAX_FRAMES_PENDING;
226 return max_frames_pending; 216 return max_frames_pending;
227 } 217 }
228 218
229 } // namespace cc 219 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/display.h ('k') | cc/surfaces/display_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698