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

Unified Diff: cc/layers/picture_layer.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/layers/picture_image_layer_unittest.cc ('k') | cc/layers/picture_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer.h
diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h
index a750c9520de99a4d008208e77627f81ee91079cb..5bafbe5829a83a6dbf2bb4ad78e087f15e21b612 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -26,7 +26,7 @@ class CC_EXPORT PictureLayer : public Layer {
void SetNearestNeighbor(bool nearest_neighbor);
// Layer interface.
- scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
+ std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
void SetLayerTreeHost(LayerTreeHost* host) override;
void PushPropertiesTo(LayerImpl* layer) override;
void SetNeedsDisplayRect(const gfx::Rect& layer_rect) override;
@@ -46,7 +46,8 @@ class CC_EXPORT PictureLayer : public Layer {
protected:
explicit PictureLayer(ContentLayerClient* client);
// Allow tests to inject a recording source.
- PictureLayer(ContentLayerClient* client, scoped_ptr<RecordingSource> source);
+ PictureLayer(ContentLayerClient* client,
+ std::unique_ptr<RecordingSource> source);
~PictureLayer() override;
bool HasDrawableContent() const override;
@@ -63,7 +64,7 @@ class CC_EXPORT PictureLayer : public Layer {
void DropRecordingSourceContentIfInvalid();
ContentLayerClient* client_;
- scoped_ptr<RecordingSource> recording_source_;
+ std::unique_ptr<RecordingSource> recording_source_;
devtools_instrumentation::
ScopedLayerObjectTracker instrumentation_object_tracker_;
« no previous file with comments | « cc/layers/picture_image_layer_unittest.cc ('k') | cc/layers/picture_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698