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

Unified Diff: cc/output/software_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/software_output_device.h ('k') | cc/output/software_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/software_renderer.h
diff --git a/cc/output/software_renderer.h b/cc/output/software_renderer.h
index 38cf2a9824e13e6d6cc386b814d54efd4edb5908..359364fda662f7c6bc0e4438c5993e308497596a 100644
--- a/cc/output/software_renderer.h
+++ b/cc/output/software_renderer.h
@@ -26,7 +26,7 @@ class TileDrawQuad;
class CC_EXPORT SoftwareRenderer : public DirectRenderer {
public:
- static scoped_ptr<SoftwareRenderer> Create(
+ static std::unique_ptr<SoftwareRenderer> Create(
RendererClient* client,
const RendererSettings* settings,
OutputSurface* output_surface,
@@ -58,7 +58,7 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
void EnsureScissorTestDisabled() override;
void CopyCurrentRenderPassToBitmap(
DrawingFrame* frame,
- scoped_ptr<CopyOutputRequest> request) override;
+ std::unique_ptr<CopyOutputRequest> request) override;
SoftwareRenderer(RendererClient* client,
const RendererSettings* settings,
@@ -110,7 +110,7 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
SkCanvas* root_canvas_;
SkCanvas* current_canvas_;
SkPaint current_paint_;
- scoped_ptr<ResourceProvider::ScopedWriteLockSoftware>
+ std::unique_ptr<ResourceProvider::ScopedWriteLockSoftware>
current_framebuffer_lock_;
skia::RefPtr<SkCanvas> current_framebuffer_canvas_;
« no previous file with comments | « cc/output/software_output_device.h ('k') | cc/output/software_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698