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

Unified Diff: gpu/tools/compositor_model_bench/render_model_utils.h

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
Index: gpu/tools/compositor_model_bench/render_model_utils.h
diff --git a/gpu/tools/compositor_model_bench/render_model_utils.h b/gpu/tools/compositor_model_bench/render_model_utils.h
index 916276825c1000447ec31458db0da57c339c594e..4c59f904b1d47fea9eaf40bc6da09eca3b1cad80 100644
--- a/gpu/tools/compositor_model_bench/render_model_utils.h
+++ b/gpu/tools/compositor_model_bench/render_model_utils.h
@@ -10,11 +10,11 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <set>
#include <vector>
#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
#include "gpu/tools/compositor_model_bench/render_tree.h"
// This is a visitor that runs over the tree structure that was built from the
@@ -23,7 +23,7 @@
// texture ID's in the tree, replacing them with the matching new textures.
class TextureGenerator : public RenderNodeVisitor {
public:
- typedef scoped_ptr<uint8_t[]> ImagePtr;
+ typedef std::unique_ptr<uint8_t[]> ImagePtr;
typedef std::vector<Tile>::iterator tile_iter;
explicit TextureGenerator(RenderNode* root);
@@ -53,9 +53,9 @@ class TextureGenerator : public RenderNodeVisitor {
TextureGenStage stage_;
std::set<int> discovered_ids_;
- scoped_ptr<GLuint[]> tex_ids_;
+ std::unique_ptr<GLuint[]> tex_ids_;
std::map<int, int> remapped_ids_;
- scoped_ptr<ImagePtr[]> image_data_;
+ std::unique_ptr<ImagePtr[]> image_data_;
int images_generated_;
std::set<int> ids_for_completed_textures_;
};
« no previous file with comments | « gpu/tools/compositor_model_bench/forward_render_model.h ('k') | gpu/tools/compositor_model_bench/render_models.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698