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

Unified Diff: cc/output/texture_mailbox_deleter.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/output/software_renderer_unittest.cc ('k') | cc/output/texture_mailbox_deleter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/texture_mailbox_deleter.h
diff --git a/cc/output/texture_mailbox_deleter.h b/cc/output/texture_mailbox_deleter.h
index 3ff91d40ebb803b0739d2b0e74ffa64f18b8158b..c4fbf0b5136f3d46073179569970df2657b67060 100644
--- a/cc/output/texture_mailbox_deleter.h
+++ b/cc/output/texture_mailbox_deleter.h
@@ -5,9 +5,9 @@
#ifndef CC_OUTPUT_TEXTURE_MAILBOX_DELETER_H_
#define CC_OUTPUT_TEXTURE_MAILBOX_DELETER_H_
+#include <memory>
#include <vector>
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "cc/base/cc_export.h"
@@ -38,7 +38,7 @@ class CC_EXPORT TextureMailboxDeleter {
// due to the compositor shutting down, then the ReleaseCallback will
// become a no-op and the texture will be deleted immediately on the
// impl thread, along with dropping the reference to the ContextProvider.
- scoped_ptr<SingleReleaseCallback> GetReleaseCallback(
+ std::unique_ptr<SingleReleaseCallback> GetReleaseCallback(
scoped_refptr<ContextProvider> context_provider,
unsigned texture_id);
@@ -50,7 +50,7 @@ class CC_EXPORT TextureMailboxDeleter {
bool is_lost);
scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_;
- std::vector<scoped_ptr<SingleReleaseCallback>> impl_callbacks_;
+ std::vector<std::unique_ptr<SingleReleaseCallback>> impl_callbacks_;
base::WeakPtrFactory<TextureMailboxDeleter> weak_ptr_factory_;
};
« no previous file with comments | « cc/output/software_renderer_unittest.cc ('k') | cc/output/texture_mailbox_deleter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698