Chromium Code Reviews| Index: cc/surfaces/surface.cc |
| diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc |
| index 32f41f1e050a29142e22b7266901a43fabfa3278..76b21b3c073a622eb63649c49fa926d1fa697a98 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,7 @@ 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(); |
| + TakeBack(&render_pass->copy_requests); |
| copy_requests->insert( |
| std::make_pair(render_pass->id, request.release())); |
|
danakj
2015/11/17 01:12:17
can you put a TODO and a bug to make this multimap
vmpstr
2015/11/17 23:26:24
I'll do this as a follow-up. Added a TODO.
|
| } |