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

Unified Diff: cc/surfaces/surface.cc

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/surfaces/display.cc ('k') | cc/surfaces/surface_aggregator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface.cc
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index 07c5ae66f7fd9cd013f46e70e1d53b7a1f039ee5..32e61c5ed778a1b49da97aaa18fb5bf955b9625b 100644
--- a/cc/surfaces/surface.cc
+++ b/cc/surfaces/surface.cc
@@ -4,6 +4,8 @@
#include "cc/surfaces/surface.h"
+#include <algorithm>
+
#include "cc/output/compositor_frame.h"
#include "cc/output/copy_output_request.h"
#include "cc/surfaces/surface_factory.h"
@@ -71,7 +73,7 @@ void Surface::TakeCopyOutputRequests(
std::multimap<RenderPassId, CopyOutputRequest*>* copy_requests) {
DCHECK(copy_requests->empty());
if (current_frame_) {
- for (auto* render_pass :
+ for (const auto& render_pass :
current_frame_->delegated_frame_data->render_pass_list) {
while (!render_pass->copy_requests.empty()) {
scoped_ptr<CopyOutputRequest> request =
@@ -111,9 +113,9 @@ void Surface::RunDrawCallbacks() {
void Surface::ClearCopyRequests() {
if (current_frame_) {
- for (auto* render_pass :
+ for (const auto& render_pass :
current_frame_->delegated_frame_data->render_pass_list) {
- for (auto* copy_request : render_pass->copy_requests)
+ for (const auto& copy_request : render_pass->copy_requests)
copy_request->SendEmptyResult();
}
}
« no previous file with comments | « cc/surfaces/display.cc ('k') | cc/surfaces/surface_aggregator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698