summaryrefslogtreecommitdiffstats
path: root/cc/surfaces/surface.cc
diff options
context:
space:
mode:
authorweiliangc <weiliangc@chromium.org>2014-10-29 13:30:12 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 20:30:47 +0000
commit48805fce83d8bd3d28a2dc84477b50d483fc46b0 (patch)
treeaaeb4915f80f61bdabf96e239f870e2ff1ae9db6 /cc/surfaces/surface.cc
parente60561ddb24168c6682466b91567b6f9d54cae94 (diff)
downloadchromium_src-48805fce83d8bd3d28a2dc84477b50d483fc46b0.zip
chromium_src-48805fce83d8bd3d28a2dc84477b50d483fc46b0.tar.gz
chromium_src-48805fce83d8bd3d28a2dc84477b50d483fc46b0.tar.bz2
Make ListContainer Consistently Act as Container of Pointers
Usage of ListContainer is replacing scoped_ptr_vector. SharedQuadState is stored in DrawQuad as pointer form. ListContainer should act as container of pointers. This CL changes the return value from dereference iterator from reference to pointers. BUG=344962 Review URL: https://codereview.chromium.org/629343002 Cr-Commit-Position: refs/heads/master@{#301916}
Diffstat (limited to 'cc/surfaces/surface.cc')
-rw-r--r--cc/surfaces/surface.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index 07c5ae6..32e61c5 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();
}
}