Index: gpu/ipc/common/mailbox_struct_traits.cc |
diff --git a/gpu/ipc/common/mailbox_struct_traits.cc b/gpu/ipc/common/mailbox_struct_traits.cc |
index 0282ff128defad5986b8dc1c055da36c8dfe815c..e4691eec4f3f167cb241b82b9696b128bb487d02 100644 |
--- a/gpu/ipc/common/mailbox_struct_traits.cc |
+++ b/gpu/ipc/common/mailbox_struct_traits.cc |
@@ -7,40 +7,11 @@ |
namespace mojo { |
// static |
-size_t ArrayTraits<MailboxName>::GetSize(const MailboxName& b) { |
- return GL_MAILBOX_SIZE_CHROMIUM; |
-} |
- |
-// static |
-int8_t* ArrayTraits<MailboxName>::GetData(MailboxName& b) { |
- return b.data; |
-} |
- |
-// static |
-const int8_t* ArrayTraits<MailboxName>::GetData(const MailboxName& b) { |
- return b.data; |
-} |
- |
-// static |
-int8_t& ArrayTraits<MailboxName>::GetAt(MailboxName& b, size_t i) { |
- return b.data[i]; |
-} |
- |
-// static |
-const int8_t& ArrayTraits<MailboxName>::GetAt(const MailboxName& b, size_t i) { |
- return b.data[i]; |
-} |
- |
-// static |
-bool ArrayTraits<MailboxName>::Resize(MailboxName& b, size_t size) { |
- return GL_MAILBOX_SIZE_CHROMIUM == size; |
-} |
- |
-// static |
MailboxName StructTraits<gpu::mojom::Mailbox, gpu::Mailbox>::name( |
const gpu::Mailbox& mailbox) { |
- MailboxName mailbox_name; |
- mailbox_name.data = const_cast<int8_t*>(&mailbox.name[0]); |
+ MailboxName mailbox_name = {GL_MAILBOX_SIZE_CHROMIUM, |
Tom Sepez
2016/06/08 17:38:47
nit: can this be just
return {GL_MAILBOX_SIZE_C
Fady Samuel
2016/06/08 17:48:03
Done.
|
+ GL_MAILBOX_SIZE_CHROMIUM, |
+ const_cast<int8_t*>(&mailbox.name[0])}; |
return mailbox_name; |
} |
@@ -48,8 +19,7 @@ MailboxName StructTraits<gpu::mojom::Mailbox, gpu::Mailbox>::name( |
bool StructTraits<gpu::mojom::Mailbox, gpu::Mailbox>::Read( |
gpu::mojom::MailboxDataView data, |
gpu::Mailbox* out) { |
- MailboxName mailbox_name; |
- mailbox_name.data = &out->name[0]; |
+ MailboxName mailbox_name = {0, GL_MAILBOX_SIZE_CHROMIUM, &out->name[0]}; |
return data.ReadName(&mailbox_name); |
} |