| Index: cc/output/direct_renderer.cc
|
| diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
|
| index 7446afdc1c2dba3aa6d14a8d939a9c130472b31d..8bb36e5288b838b44256d5e902474520d4d1b88f 100644
|
| --- a/cc/output/direct_renderer.cc
|
| +++ b/cc/output/direct_renderer.cc
|
| @@ -181,7 +181,7 @@ void DirectRenderer::DecideRenderPassAllocationsForFrame(
|
|
|
| for (size_t i = 0; i < render_passes_in_draw_order.size(); ++i) {
|
| if (render_pass_textures_.count(render_passes_in_draw_order[i]->id) == 0) {
|
| - scoped_ptr<ScopedResource> texture =
|
| + std::unique_ptr<ScopedResource> texture =
|
| ScopedResource::Create(resource_provider_);
|
| render_pass_textures_[render_passes_in_draw_order[i]->id] =
|
| std::move(texture);
|
| @@ -397,7 +397,7 @@ void DirectRenderer::DoDrawPolygon(const DrawPolygon& poly,
|
| }
|
|
|
| void DirectRenderer::FlushPolygons(
|
| - std::deque<scoped_ptr<DrawPolygon>>* poly_list,
|
| + std::deque<std::unique_ptr<DrawPolygon>>* poly_list,
|
| DrawingFrame* frame,
|
| const gfx::Rect& render_pass_scissor,
|
| bool use_render_pass_scissor) {
|
| @@ -482,7 +482,7 @@ void DirectRenderer::DrawRenderPass(DrawingFrame* frame,
|
| MoveFromDrawToWindowSpace(frame, render_pass_scissor_in_draw_space));
|
|
|
| const QuadList& quad_list = render_pass->quad_list;
|
| - std::deque<scoped_ptr<DrawPolygon>> poly_list;
|
| + std::deque<std::unique_ptr<DrawPolygon>> poly_list;
|
|
|
| int next_polygon_id = 0;
|
| int last_sorting_context_id = 0;
|
| @@ -504,7 +504,7 @@ void DirectRenderer::DrawRenderPass(DrawingFrame* frame,
|
| // This layer is in a 3D sorting context so we add it to the list of
|
| // polygons to go into the BSP tree.
|
| if (quad.shared_quad_state->sorting_context_id != 0) {
|
| - scoped_ptr<DrawPolygon> new_polygon(new DrawPolygon(
|
| + std::unique_ptr<DrawPolygon> new_polygon(new DrawPolygon(
|
| *it, gfx::RectF(quad.visible_rect),
|
| quad.shared_quad_state->quad_to_target_transform, next_polygon_id++));
|
| if (new_polygon->points().size() > 2u) {
|
|
|