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

Unified Diff: cc/layers/ui_resource_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/texture_layer_unittest.cc ('k') | cc/layers/ui_resource_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/ui_resource_layer.h
diff --git a/cc/layers/ui_resource_layer.h b/cc/layers/ui_resource_layer.h
index 794a86c88aa80c7f259a14800200c9e64fcfe895..8004d1e51a0c40b03d6d900c149fad6cd05e4714 100644
--- a/cc/layers/ui_resource_layer.h
+++ b/cc/layers/ui_resource_layer.h
@@ -5,8 +5,9 @@
#ifndef CC_LAYERS_UI_RESOURCE_LAYER_H_
#define CC_LAYERS_UI_RESOURCE_LAYER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
#include "cc/layers/layer.h"
#include "cc/resources/ui_resource_client.h"
@@ -54,7 +55,7 @@ class CC_EXPORT UIResourceLayer : public Layer {
bool HasDrawableContent() const override;
- scoped_ptr<UIResourceHolder> ui_resource_holder_;
+ std::unique_ptr<UIResourceHolder> ui_resource_holder_;
SkBitmap bitmap_;
gfx::PointF uv_top_left_;
@@ -62,7 +63,7 @@ class CC_EXPORT UIResourceLayer : public Layer {
float vertex_opacity_[4];
private:
- scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
+ std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
void RecreateUIResourceHolder();
DISALLOW_COPY_AND_ASSIGN(UIResourceLayer);
« no previous file with comments | « cc/layers/texture_layer_unittest.cc ('k') | cc/layers/ui_resource_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698