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

Side by Side Diff: cc/output/delegating_renderer.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/output/delegating_renderer.h ('k') | cc/output/delegating_renderer_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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/output/delegating_renderer.h" 5 #include "cc/output/delegating_renderer.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/ptr_util.h"
11 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
12 #include "cc/output/compositor_frame_ack.h" 13 #include "cc/output/compositor_frame_ack.h"
13 #include "cc/output/context_provider.h" 14 #include "cc/output/context_provider.h"
14 #include "cc/quads/draw_quad.h" 15 #include "cc/quads/draw_quad.h"
15 #include "cc/quads/render_pass.h" 16 #include "cc/quads/render_pass.h"
16 #include "cc/resources/resource_provider.h" 17 #include "cc/resources/resource_provider.h"
17 #include "gpu/command_buffer/client/context_support.h" 18 #include "gpu/command_buffer/client/context_support.h"
18 #include "gpu/command_buffer/client/gles2_interface.h" 19 #include "gpu/command_buffer/client/gles2_interface.h"
19 20
20 21
21 namespace cc { 22 namespace cc {
22 23
23 scoped_ptr<DelegatingRenderer> DelegatingRenderer::Create( 24 std::unique_ptr<DelegatingRenderer> DelegatingRenderer::Create(
24 RendererClient* client, 25 RendererClient* client,
25 const RendererSettings* settings, 26 const RendererSettings* settings,
26 OutputSurface* output_surface, 27 OutputSurface* output_surface,
27 ResourceProvider* resource_provider) { 28 ResourceProvider* resource_provider) {
28 return make_scoped_ptr(new DelegatingRenderer( 29 return base::WrapUnique(new DelegatingRenderer(
29 client, settings, output_surface, resource_provider)); 30 client, settings, output_surface, resource_provider));
30 } 31 }
31 32
32 DelegatingRenderer::DelegatingRenderer(RendererClient* client, 33 DelegatingRenderer::DelegatingRenderer(RendererClient* client,
33 const RendererSettings* settings, 34 const RendererSettings* settings,
34 OutputSurface* output_surface, 35 OutputSurface* output_surface,
35 ResourceProvider* resource_provider) 36 ResourceProvider* resource_provider)
36 : Renderer(client, settings), 37 : Renderer(client, settings),
37 output_surface_(output_surface), 38 output_surface_(output_surface),
38 resource_provider_(resource_provider) { 39 resource_provider_(resource_provider) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 75
75 void DelegatingRenderer::DrawFrame(RenderPassList* render_passes_in_draw_order, 76 void DelegatingRenderer::DrawFrame(RenderPassList* render_passes_in_draw_order,
76 float device_scale_factor, 77 float device_scale_factor,
77 const gfx::Rect& device_viewport_rect, 78 const gfx::Rect& device_viewport_rect,
78 const gfx::Rect& device_clip_rect, 79 const gfx::Rect& device_clip_rect,
79 bool disable_picture_quad_image_filtering) { 80 bool disable_picture_quad_image_filtering) {
80 TRACE_EVENT0("cc", "DelegatingRenderer::DrawFrame"); 81 TRACE_EVENT0("cc", "DelegatingRenderer::DrawFrame");
81 82
82 DCHECK(!delegated_frame_data_); 83 DCHECK(!delegated_frame_data_);
83 84
84 delegated_frame_data_ = make_scoped_ptr(new DelegatedFrameData); 85 delegated_frame_data_ = base::WrapUnique(new DelegatedFrameData);
85 DelegatedFrameData& out_data = *delegated_frame_data_; 86 DelegatedFrameData& out_data = *delegated_frame_data_;
86 out_data.device_scale_factor = device_scale_factor; 87 out_data.device_scale_factor = device_scale_factor;
87 // Move the render passes and resources into the |out_frame|. 88 // Move the render passes and resources into the |out_frame|.
88 out_data.render_pass_list.swap(*render_passes_in_draw_order); 89 out_data.render_pass_list.swap(*render_passes_in_draw_order);
89 90
90 // Collect all resource ids in the render passes into a ResourceIdArray. 91 // Collect all resource ids in the render passes into a ResourceIdArray.
91 ResourceProvider::ResourceIdArray resources; 92 ResourceProvider::ResourceIdArray resources;
92 for (const auto& render_pass : out_data.render_pass_list) { 93 for (const auto& render_pass : out_data.render_pass_list) {
93 for (const auto& quad : render_pass->quad_list) { 94 for (const auto& quad : render_pass->quad_list) {
94 for (ResourceId resource_id : quad->resources) 95 for (ResourceId resource_id : quad->resources)
(...skipping 26 matching lines...) Expand all
121 } 122 }
122 } 123 }
123 if (context_provider) { 124 if (context_provider) {
124 // If we are not visible, we ask the context to aggressively free resources. 125 // If we are not visible, we ask the context to aggressively free resources.
125 context_provider->ContextSupport()->SetAggressivelyFreeResources( 126 context_provider->ContextSupport()->SetAggressivelyFreeResources(
126 !visible()); 127 !visible());
127 } 128 }
128 } 129 }
129 130
130 } // namespace cc 131 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/delegating_renderer.h ('k') | cc/output/delegating_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698