Chromium Code Reviews| Index: cc/output/direct_renderer.cc |
| diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc |
| index 16dcd5a3d3c35a8379c12ebb79ec20b9a6afec34..4cafa82587817663ed7a19c07d80f3ab6d034452 100644 |
| --- a/cc/output/direct_renderer.cc |
| +++ b/cc/output/direct_renderer.cc |
| @@ -151,7 +151,7 @@ void DirectRenderer::DecideRenderPassAllocationsForFrame( |
| for (size_t i = 0; i < render_passes_in_draw_order.size(); ++i) |
| render_passes_in_frame.insert(std::pair<RenderPassId, gfx::Size>( |
| render_passes_in_draw_order[i]->id, |
| - RenderPassTextureSize(render_passes_in_draw_order[i]))); |
| + RenderPassTextureSize(render_passes_in_draw_order[i].get()))); |
| std::vector<RenderPassId> passes_to_delete; |
| for (auto pass_iter = render_pass_textures_.begin(); |
| @@ -198,7 +198,8 @@ void DirectRenderer::DrawFrame(RenderPassList* render_passes_in_draw_order, |
| "Renderer4.renderPassCount", |
| base::saturated_cast<int>(render_passes_in_draw_order->size())); |
| - const RenderPass* root_render_pass = render_passes_in_draw_order->back(); |
| + const RenderPass* root_render_pass = |
| + render_passes_in_draw_order->back().get(); |
| DCHECK(root_render_pass); |
| DrawingFrame frame; |
| @@ -247,7 +248,7 @@ void DirectRenderer::DrawFrame(RenderPassList* render_passes_in_draw_order, |
| // overlays and dont have any copy requests. |
| if (frame.root_damage_rect.IsEmpty()) { |
| bool handle_copy_requests = false; |
| - for (auto* pass : *render_passes_in_draw_order) { |
| + for (const scoped_ptr<RenderPass>& pass : *render_passes_in_draw_order) { |
|
danakj
2015/11/17 01:12:17
auto
vmpstr
2015/11/17 23:26:24
Done.
|
| if (!pass->copy_requests.empty()) { |
| handle_copy_requests = true; |
| break; |
| @@ -264,19 +265,18 @@ void DirectRenderer::DrawFrame(RenderPassList* render_passes_in_draw_order, |
| } |
| for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) { |
|
danakj
2015/11/17 01:12:17
what have i done. iterating on size() and using at
vmpstr
2015/11/17 23:26:24
Done.
|
| - RenderPass* pass = render_passes_in_draw_order->at(i); |
| + RenderPass* pass = (*render_passes_in_draw_order)[i].get(); |
| DrawRenderPass(&frame, pass); |
| - for (ScopedPtrVector<CopyOutputRequest>::iterator it = |
| + for (std::vector<scoped_ptr<CopyOutputRequest>>::iterator it = |
|
danakj
2015/11/17 01:12:17
auto
vmpstr
2015/11/17 23:26:24
Done.
|
| pass->copy_requests.begin(); |
| - it != pass->copy_requests.end(); |
| - ++it) { |
| + it != pass->copy_requests.end(); ++it) { |
| if (it != pass->copy_requests.begin()) { |
| // Doing a readback is destructive of our state on Mac, so make sure |
| // we restore the state between readbacks. http://crbug.com/99393. |
| UseRenderPass(&frame, pass); |
| } |
| - CopyCurrentRenderPassToBitmap(&frame, pass->copy_requests.take(it)); |
| + CopyCurrentRenderPassToBitmap(&frame, it->Pass()); |
| } |
| } |
| FinishDrawingFrame(&frame); |