| Index: cc/output/direct_renderer.cc
|
| diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
|
| index 0a66eea2ae10bab6c2007d7e50fe60ea2c94d924..443cb35b84f081cfcca3c1979759d47b211329f9 100644
|
| --- a/cc/output/direct_renderer.cc
|
| +++ b/cc/output/direct_renderer.cc
|
| @@ -385,10 +385,11 @@ void DirectRenderer::DoDrawPolygon(const DrawPolygon& poly,
|
| }
|
| }
|
|
|
| -void DirectRenderer::FlushPolygons(ScopedPtrDeque<DrawPolygon>* poly_list,
|
| - DrawingFrame* frame,
|
| - const gfx::Rect& render_pass_scissor,
|
| - bool use_render_pass_scissor) {
|
| +void DirectRenderer::FlushPolygons(
|
| + std::deque<scoped_ptr<DrawPolygon>>* poly_list,
|
| + DrawingFrame* frame,
|
| + const gfx::Rect& render_pass_scissor,
|
| + bool use_render_pass_scissor) {
|
| if (poly_list->empty()) {
|
| return;
|
| }
|
| @@ -454,7 +455,7 @@ void DirectRenderer::DrawRenderPass(DrawingFrame* frame,
|
| MoveFromDrawToWindowSpace(frame, render_pass_scissor_in_draw_space));
|
|
|
| const QuadList& quad_list = render_pass->quad_list;
|
| - ScopedPtrDeque<DrawPolygon> poly_list;
|
| + std::deque<scoped_ptr<DrawPolygon>> poly_list;
|
|
|
| int next_polygon_id = 0;
|
| int last_sorting_context_id = 0;
|
|
|