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

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

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: just the vector Created 5 years, 1 month 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
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/thread_task_runner_handle.h" 7 #include "base/thread_task_runner_handle.h"
8 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
9 #include "cc/debug/benchmark_instrumentation.h" 9 #include "cc/debug/benchmark_instrumentation.h"
10 #include "cc/output/compositor_frame.h" 10 #include "cc/output/compositor_frame.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 surface->RunDrawCallbacks(SurfaceDrawStatus::DRAWN); 205 surface->RunDrawCallbacks(SurfaceDrawStatus::DRAWN);
206 } 206 }
207 207
208 DelegatedFrameData* frame_data = frame->delegated_frame_data.get(); 208 DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
209 209
210 frame->metadata.latency_info.insert(frame->metadata.latency_info.end(), 210 frame->metadata.latency_info.insert(frame->metadata.latency_info.end(),
211 stored_latency_info_.begin(), 211 stored_latency_info_.begin(),
212 stored_latency_info_.end()); 212 stored_latency_info_.end());
213 stored_latency_info_.clear(); 213 stored_latency_info_.clear();
214 bool have_copy_requests = false; 214 bool have_copy_requests = false;
215 for (const auto* pass : frame_data->render_pass_list) { 215 for (const scoped_ptr<RenderPass>& pass : frame_data->render_pass_list) {
danakj 2015/11/17 01:12:17 auto
vmpstr 2015/11/17 23:26:24 Done.
216 have_copy_requests |= !pass->copy_requests.empty(); 216 have_copy_requests |= !pass->copy_requests.empty();
217 } 217 }
218 218
219 gfx::Size surface_size; 219 gfx::Size surface_size;
220 bool have_damage = false; 220 bool have_damage = false;
221 if (!frame_data->render_pass_list.empty()) { 221 if (!frame_data->render_pass_list.empty()) {
222 surface_size = frame_data->render_pass_list.back()->output_rect.size(); 222 surface_size = frame_data->render_pass_list.back()->output_rect.size();
223 have_damage = 223 have_damage =
224 !frame_data->render_pass_list.back()->damage_rect.size().IsEmpty(); 224 !frame_data->render_pass_list.back()->damage_rect.size().IsEmpty();
225 } 225 }
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 353
354 if (surface_id == current_surface_id_) 354 if (surface_id == current_surface_id_)
355 UpdateRootSurfaceResourcesLocked(); 355 UpdateRootSurfaceResourcesLocked();
356 } 356 }
357 357
358 SurfaceId Display::CurrentSurfaceId() { 358 SurfaceId Display::CurrentSurfaceId() {
359 return current_surface_id_; 359 return current_surface_id_;
360 } 360 }
361 361
362 } // namespace cc 362 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698