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

Unified Diff: cc/resources/texture_mailbox_deleter.h

Issue 23648014: cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: releasecallback: dchecks Created 7 years, 3 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: cc/resources/texture_mailbox_deleter.h
diff --git a/cc/resources/texture_mailbox_deleter.h b/cc/resources/texture_mailbox_deleter.h
index 608dd7a4ef7d7017aad60f2c4f00f48b9df52bb6..6f581d60d154a996660a6df1185d0fb644f83308 100644
--- a/cc/resources/texture_mailbox_deleter.h
+++ b/cc/resources/texture_mailbox_deleter.h
@@ -8,10 +8,10 @@
#include "base/memory/weak_ptr.h"
#include "cc/base/cc_export.h"
#include "cc/base/scoped_ptr_vector.h"
-#include "cc/resources/texture_mailbox.h"
namespace cc {
class ContextProvider;
+class ScopedReleaseCallback;
class CC_EXPORT TextureMailboxDeleter {
public:
@@ -25,7 +25,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.
- TextureMailbox::ReleaseCallback GetReleaseCallback(
+ scoped_ptr<ScopedReleaseCallback> GetReleaseCallback(
const scoped_refptr<ContextProvider>& context_provider,
unsigned texture_id);
@@ -33,12 +33,12 @@ class CC_EXPORT TextureMailboxDeleter {
// Runs the |impl_callback| to delete the texture and removes the callback
// from the |impl_callbacks_| list.
void RunDeleteTextureOnImplThread(
- TextureMailbox::ReleaseCallback* impl_callback,
+ ScopedReleaseCallback* impl_callback,
unsigned sync_point,
bool is_lost);
base::WeakPtrFactory<TextureMailboxDeleter> weak_ptr_factory_;
- ScopedPtrVector<TextureMailbox::ReleaseCallback> impl_callbacks_;
+ ScopedPtrVector<ScopedReleaseCallback> impl_callbacks_;
};
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698