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

Unified Diff: cc/texture_mailbox.h

Issue 12378053: Move Mailbox from cc to gpu, and its traits to gpu/ipc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ios hate Created 7 years, 10 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/texture_layer_unittest.cc ('k') | cc/texture_mailbox.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_mailbox.h
diff --git a/cc/texture_mailbox.h b/cc/texture_mailbox.h
index 95bf170ee0137f3fd475164e8532e7e5026b45b5..9314ddd9b945aad7cb828080eccea5d292c5598b 100644
--- a/cc/texture_mailbox.h
+++ b/cc/texture_mailbox.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
#include "cc/cc_export.h"
-#include "cc/transferable_resource.h"
+#include "gpu/command_buffer/common/mailbox.h"
namespace cc {
@@ -20,9 +20,9 @@ class CC_EXPORT TextureMailbox {
TextureMailbox();
TextureMailbox(const std::string& mailbox_name,
const ReleaseCallback& callback);
- TextureMailbox(const Mailbox& mailbox_name,
+ TextureMailbox(const gpu::Mailbox& mailbox_name,
const ReleaseCallback& callback);
- TextureMailbox(const Mailbox& mailbox_name,
+ TextureMailbox(const gpu::Mailbox& mailbox_name,
const ReleaseCallback& callback,
unsigned sync_point);
@@ -30,17 +30,17 @@ class CC_EXPORT TextureMailbox {
const ReleaseCallback& callback() const { return callback_; }
const int8* data() const { return name_.name; }
- bool Equals(const Mailbox&) const;
+ bool Equals(const gpu::Mailbox&) const;
bool Equals(const TextureMailbox&) const;
bool IsEmpty() const;
- const Mailbox& name() const { return name_; }
+ const gpu::Mailbox& name() const { return name_; }
void ResetSyncPoint() { sync_point_ = 0; }
void RunReleaseCallback(unsigned sync_point) const;
- void SetName(const Mailbox&);
+ void SetName(const gpu::Mailbox&);
unsigned sync_point() const { return sync_point_; }
private:
- Mailbox name_;
+ gpu::Mailbox name_;
ReleaseCallback callback_;
unsigned sync_point_;
};
« no previous file with comments | « cc/texture_layer_unittest.cc ('k') | cc/texture_mailbox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698