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

Unified Diff: cc/layers/heads_up_display_layer_impl.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/heads_up_display_layer.cc ('k') | cc/layers/heads_up_display_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « cc/layers/heads_up_display_layer.cc ('k') | cc/layers/heads_up_display_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698