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

Unified Diff: ui/compositor/paint_context.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/compositor/layer_unittest.cc ('k') | ui/compositor/paint_recorder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/paint_context.h
diff --git a/ui/compositor/paint_context.h b/ui/compositor/paint_context.h
index 3473f236414c45bde4b84e6a38966d4ac8756f4d..af69f7084f699ad67adc13a94e539c4cd040787b 100644
--- a/ui/compositor/paint_context.h
+++ b/ui/compositor/paint_context.h
@@ -5,9 +5,10 @@
#ifndef UI_COMPOSITOR_PAINT_CONTEXT_H_
#define UI_COMPOSITOR_PAINT_CONTEXT_H_
+#include <memory>
+
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/compositor/compositor_export.h"
#include "ui/gfx/geometry/rect.h"
@@ -89,7 +90,7 @@ class COMPOSITOR_EXPORT PaintContext {
gfx::Rect ToLayerSpaceRect(const gfx::Rect& rect) const;
cc::DisplayItemList* list_;
- scoped_ptr<SkPictureRecorder> owned_recorder_;
+ std::unique_ptr<SkPictureRecorder> owned_recorder_;
// A pointer to the |owned_recorder_| in this PaintContext, or in another one
// which this was copied from. We expect a copied-from PaintContext to outlive
// copies made from it.
« no previous file with comments | « ui/compositor/layer_unittest.cc ('k') | ui/compositor/paint_recorder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698