diff options
| author | vmpstr <vmpstr@chromium.org> | 2015-11-18 02:41:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 10:42:27 +0000 |
| commit | a370ef52788ea0f6c410b05ec40a74ee9bf3a647 (patch) | |
| tree | 3a17b8c71c12f28b9aab3c6d82b30afda9b7a060 /cc/surfaces/surface.cc | |
| parent | 93a4c577dd608bc72ac31ea396201590a23b46c5 (diff) | |
| download | chromium_src-a370ef52788ea0f6c410b05ec40a74ee9bf3a647.zip chromium_src-a370ef52788ea0f6c410b05ec40a74ee9bf3a647.tar.gz chromium_src-a370ef52788ea0f6c410b05ec40a74ee9bf3a647.tar.bz2 | |
cc: Remove ScopedPtrVector and cc::remove_if.
This patch removes ScopedPtrVector and cc::remove_if. It depends on
https://codereview.chromium.org/1441613002 for TakeBack.
R=danakj
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1437413002
Cr-Commit-Position: refs/heads/master@{#360318}
Diffstat (limited to 'cc/surfaces/surface.cc')
| -rw-r--r-- | cc/surfaces/surface.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc index 32f41f1..351b679 100644 --- a/cc/surfaces/surface.cc +++ b/cc/surfaces/surface.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "cc/base/container_util.h" #include "cc/output/compositor_frame.h" #include "cc/output/copy_output_request.h" #include "cc/surfaces/surface_factory.h" @@ -116,8 +117,9 @@ void Surface::TakeCopyOutputRequests( current_frame_->delegated_frame_data->render_pass_list) { while (!render_pass->copy_requests.empty()) { scoped_ptr<CopyOutputRequest> request = - render_pass->copy_requests.take_back(); - render_pass->copy_requests.pop_back(); + PopBack(&render_pass->copy_requests); + // TODO(vmpstr): |copy_requests| should store scoped_ptrs. + // crbug.com/557388. copy_requests->insert( std::make_pair(render_pass->id, request.release())); } |