| Index: cc/texture_mailbox.cc
|
| diff --git a/cc/texture_mailbox.cc b/cc/texture_mailbox.cc
|
| index c0990b1eb6326e5948de03f0d5241aa921f5639c..b534605f77793a4583d376db2a1ea3cd4033b5cd 100644
|
| --- a/cc/texture_mailbox.cc
|
| +++ b/cc/texture_mailbox.cc
|
| @@ -19,33 +19,33 @@ TextureMailbox::TextureMailbox(
|
| DCHECK(mailbox_name.empty() == mailbox_callback.is_null());
|
| if (!mailbox_name.empty()) {
|
| CHECK(mailbox_name.size() == sizeof(name_.name));
|
| - name_.setName(reinterpret_cast<const int8*>(mailbox_name.data()));
|
| + name_.SetName(reinterpret_cast<const int8*>(mailbox_name.data()));
|
| }
|
| }
|
|
|
| TextureMailbox::TextureMailbox(
|
| - const Mailbox& mailbox_name,
|
| + const gpu::Mailbox& mailbox_name,
|
| const ReleaseCallback& mailbox_callback)
|
| : callback_(mailbox_callback),
|
| sync_point_(0) {
|
| - DCHECK(mailbox_name.isZero() == mailbox_callback.is_null());
|
| - name_.setName(mailbox_name.name);
|
| + DCHECK(mailbox_name.IsZero() == mailbox_callback.is_null());
|
| + name_.SetName(mailbox_name.name);
|
| }
|
|
|
| TextureMailbox::TextureMailbox(
|
| - const Mailbox& mailbox_name,
|
| + const gpu::Mailbox& mailbox_name,
|
| const ReleaseCallback& mailbox_callback,
|
| unsigned sync_point)
|
| : callback_(mailbox_callback),
|
| sync_point_(sync_point) {
|
| - DCHECK(mailbox_name.isZero() == mailbox_callback.is_null());
|
| - name_.setName(mailbox_name.name);
|
| + DCHECK(mailbox_name.IsZero() == mailbox_callback.is_null());
|
| + name_.SetName(mailbox_name.name);
|
| }
|
|
|
| TextureMailbox::~TextureMailbox() {
|
| }
|
|
|
| -bool TextureMailbox::Equals(const Mailbox& other) const {
|
| +bool TextureMailbox::Equals(const gpu::Mailbox& other) const {
|
| return !memcmp(data(), other.name, sizeof(name_.name));
|
| }
|
|
|
| @@ -54,7 +54,7 @@ bool TextureMailbox::Equals(const TextureMailbox& other) const {
|
| }
|
|
|
| bool TextureMailbox::IsEmpty() const {
|
| - return name_.isZero();
|
| + return name_.IsZero();
|
| }
|
|
|
| void TextureMailbox::RunReleaseCallback(unsigned sync_point) const {
|
| @@ -62,8 +62,8 @@ void TextureMailbox::RunReleaseCallback(unsigned sync_point) const {
|
| callback_.Run(sync_point);
|
| }
|
|
|
| -void TextureMailbox::SetName(const Mailbox& other) {
|
| - name_.setName(other.name);
|
| +void TextureMailbox::SetName(const gpu::Mailbox& other) {
|
| + name_.SetName(other.name);
|
| }
|
|
|
| } // namespace cc
|
|
|