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

Unified Diff: cc/output/direct_renderer.h

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/delegating_renderer_unittest.cc ('k') | cc/output/direct_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/direct_renderer.h
diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h
index 1328a3df56deb46508a72339f41cc42dbe43d51e..88fff7bf8440e8758f3271054b9473b4f850aee8 100644
--- a/cc/output/direct_renderer.h
+++ b/cc/output/direct_renderer.h
@@ -106,7 +106,7 @@ class CC_EXPORT DirectRenderer : public Renderer {
static gfx::Size RenderPassTextureSize(const RenderPass* render_pass);
- void FlushPolygons(std::deque<scoped_ptr<DrawPolygon>>* poly_list,
+ void FlushPolygons(std::deque<std::unique_ptr<DrawPolygon>>* poly_list,
DrawingFrame* frame,
const gfx::Rect& render_pass_scissor,
bool use_render_pass_scissor);
@@ -140,14 +140,16 @@ class CC_EXPORT DirectRenderer : public Renderer {
virtual void CopyCurrentRenderPassToBitmap(
DrawingFrame* frame,
- scoped_ptr<CopyOutputRequest> request) = 0;
+ std::unique_ptr<CopyOutputRequest> request) = 0;
// TODO(danakj): Just use a vector of pairs here? Hash map is way overkill.
- std::unordered_map<RenderPassId, scoped_ptr<ScopedResource>, RenderPassIdHash>
+ std::unordered_map<RenderPassId,
+ std::unique_ptr<ScopedResource>,
+ RenderPassIdHash>
render_pass_textures_;
OutputSurface* output_surface_;
ResourceProvider* resource_provider_;
- scoped_ptr<OverlayProcessor> overlay_processor_;
+ std::unique_ptr<OverlayProcessor> overlay_processor_;
// For use in coordinate conversion, this stores the output rect, viewport
// rect (= unflipped version of glViewport rect), the size of target
« no previous file with comments | « cc/output/delegating_renderer_unittest.cc ('k') | cc/output/direct_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698