Index: cc/layers/heads_up_display_layer_impl.h |
diff --git a/cc/layers/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h |
index b97eb141027bb7f9f88774cad4192dc276998082..ac32edf9224ab132cba517002cc8c36c6eab9883 100644 |
--- a/cc/layers/heads_up_display_layer_impl.h |
+++ b/cc/layers/heads_up_display_layer_impl.h |
@@ -5,11 +5,12 @@ |
#ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_ |
#define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_ |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "base/time/time.h" |
#include "cc/base/cc_export.h" |
#include "cc/debug/debug_rect_history.h" |
@@ -29,13 +30,14 @@ class PaintTimeCounter; |
class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl { |
public: |
- static scoped_ptr<HeadsUpDisplayLayerImpl> Create(LayerTreeImpl* tree_impl, |
- int id) { |
- return make_scoped_ptr(new HeadsUpDisplayLayerImpl(tree_impl, id)); |
+ static std::unique_ptr<HeadsUpDisplayLayerImpl> Create( |
+ LayerTreeImpl* tree_impl, |
+ int id) { |
+ return base::WrapUnique(new HeadsUpDisplayLayerImpl(tree_impl, id)); |
} |
~HeadsUpDisplayLayerImpl() override; |
- scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; |
+ std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; |
bool WillDraw(DrawMode draw_mode, |
ResourceProvider* resource_provider) override; |
@@ -129,7 +131,7 @@ class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl { |
void AcquireResource(ResourceProvider* resource_provider); |
void ReleaseUnmatchedSizeResources(ResourceProvider* resource_provider); |
- std::vector<scoped_ptr<ScopedResource>> resources_; |
+ std::vector<std::unique_ptr<ScopedResource>> resources_; |
sk_sp<SkSurface> hud_surface_; |
skia::RefPtr<SkTypeface> typeface_; |