Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: cc/layers/render_surface_impl.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/render_surface_impl.h ('k') | cc/layers/render_surface_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/render_surface_impl.h" 5 #include "cc/layers/render_surface_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 156 }
157 157
158 RenderPassId RenderSurfaceImpl::GetRenderPassId() { 158 RenderPassId RenderSurfaceImpl::GetRenderPassId() {
159 int layer_id = owning_layer_->id(); 159 int layer_id = owning_layer_->id();
160 int sub_id = 0; 160 int sub_id = 0;
161 DCHECK_GT(layer_id, 0); 161 DCHECK_GT(layer_id, 0);
162 return RenderPassId(layer_id, sub_id); 162 return RenderPassId(layer_id, sub_id);
163 } 163 }
164 164
165 void RenderSurfaceImpl::AppendRenderPasses(RenderPassSink* pass_sink) { 165 void RenderSurfaceImpl::AppendRenderPasses(RenderPassSink* pass_sink) {
166 scoped_ptr<RenderPass> pass = RenderPass::Create(layer_list_.size()); 166 std::unique_ptr<RenderPass> pass = RenderPass::Create(layer_list_.size());
167 pass->SetNew(GetRenderPassId(), content_rect(), 167 pass->SetNew(GetRenderPassId(), content_rect(),
168 gfx::IntersectRects(content_rect(), 168 gfx::IntersectRects(content_rect(),
169 damage_tracker_->current_damage_rect()), 169 damage_tracker_->current_damage_rect()),
170 draw_properties_.screen_space_transform); 170 draw_properties_.screen_space_transform);
171 pass_sink->AppendRenderPass(std::move(pass)); 171 pass_sink->AppendRenderPass(std::move(pass));
172 } 172 }
173 173
174 void RenderSurfaceImpl::AppendQuads(RenderPass* render_pass, 174 void RenderSurfaceImpl::AppendQuads(RenderPass* render_pass,
175 const gfx::Transform& draw_transform, 175 const gfx::Transform& draw_transform,
176 const Occlusion& occlusion_in_content_space, 176 const Occlusion& occlusion_in_content_space,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 RenderPassDrawQuad* quad = 224 RenderPassDrawQuad* quad =
225 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); 225 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
226 quad->SetNew(shared_quad_state, content_rect(), visible_layer_rect, 226 quad->SetNew(shared_quad_state, content_rect(), visible_layer_rect,
227 render_pass_id, mask_resource_id, mask_uv_scale, 227 render_pass_id, mask_resource_id, mask_uv_scale,
228 mask_texture_size, owning_layer_->filters(), 228 mask_texture_size, owning_layer_->filters(),
229 owning_layer_to_target_scale, 229 owning_layer_to_target_scale,
230 owning_layer_->background_filters()); 230 owning_layer_->background_filters());
231 } 231 }
232 232
233 } // namespace cc 233 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/render_surface_impl.h ('k') | cc/layers/render_surface_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698