| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/public/cpp/bindings/lib/message_builder.h" | 5 #include "mojo/public/cpp/bindings/lib/message_builder.h" |
| 6 | 6 |
| 7 #include "mojo/public/cpp/bindings/message.h" | 7 #include "mojo/public/cpp/bindings/message.h" |
| 8 | 8 |
| 9 namespace mojo { | 9 namespace mojo { |
| 10 namespace internal { | 10 namespace internal { |
| 11 | 11 |
| 12 template <typename Header> | 12 template <typename Header> |
| 13 void Allocate(Buffer* buf, Header** header) { | 13 void Allocate(Buffer* buf, Header** header) { |
| 14 *header = static_cast<Header*>(buf->Allocate(sizeof(Header))); | 14 *header = static_cast<Header*>(buf->Allocate(sizeof(Header))); |
| 15 (*header)->num_bytes = sizeof(Header); | 15 (*header)->num_bytes = sizeof(Header); |
| 16 } | 16 } |
| 17 | 17 |
| 18 MessageBuilder::MessageBuilder(uint32_t name, size_t payload_size) | 18 MessageBuilder::MessageBuilder(uint32_t name, size_t payload_size) |
| 19 : buf_(sizeof(MessageHeader) + payload_size) { | 19 : buf_(sizeof(MessageHeader) + payload_size) { |
| 20 MessageHeader* header; | 20 MessageHeader* header; |
| 21 Allocate(&buf_, &header); | 21 Allocate(&buf_, &header); |
| 22 // TODO(yzshen): In order to work with other bindings which still interprets | 22 header->version = 0; |
| 23 // the |version| field as |num_fields|, set it to version 2 for now. | |
| 24 header->version = 2; | |
| 25 header->name = name; | 23 header->name = name; |
| 26 } | 24 } |
| 27 | 25 |
| 28 MessageBuilder::~MessageBuilder() { | 26 MessageBuilder::~MessageBuilder() { |
| 29 } | 27 } |
| 30 | 28 |
| 31 void MessageBuilder::Finish(Message* message) { | 29 void MessageBuilder::Finish(Message* message) { |
| 32 uint32_t num_bytes = static_cast<uint32_t>(buf_.size()); | 30 uint32_t num_bytes = static_cast<uint32_t>(buf_.size()); |
| 33 message->AdoptData(num_bytes, static_cast<MessageData*>(buf_.Leak())); | 31 message->AdoptData(num_bytes, static_cast<MessageData*>(buf_.Leak())); |
| 34 } | 32 } |
| 35 | 33 |
| 36 MessageBuilder::MessageBuilder(size_t size) : buf_(size) { | 34 MessageBuilder::MessageBuilder(size_t size) : buf_(size) { |
| 37 } | 35 } |
| 38 | 36 |
| 39 MessageWithRequestIDBuilder::MessageWithRequestIDBuilder(uint32_t name, | 37 MessageWithRequestIDBuilder::MessageWithRequestIDBuilder(uint32_t name, |
| 40 size_t payload_size, | 38 size_t payload_size, |
| 41 uint32_t flags, | 39 uint32_t flags, |
| 42 uint64_t request_id) | 40 uint64_t request_id) |
| 43 : MessageBuilder(sizeof(MessageHeaderWithRequestID) + payload_size) { | 41 : MessageBuilder(sizeof(MessageHeaderWithRequestID) + payload_size) { |
| 44 MessageHeaderWithRequestID* header; | 42 MessageHeaderWithRequestID* header; |
| 45 Allocate(&buf_, &header); | 43 Allocate(&buf_, &header); |
| 46 // TODO(yzshen): In order to work with other bindings which still interprets | 44 header->version = 1; |
| 47 // the |version| field as |num_fields|, set it to version 3 for now. | |
| 48 header->version = 3; | |
| 49 header->name = name; | 45 header->name = name; |
| 50 header->flags = flags; | 46 header->flags = flags; |
| 51 header->request_id = request_id; | 47 header->request_id = request_id; |
| 52 } | 48 } |
| 53 | 49 |
| 54 } // namespace internal | 50 } // namespace internal |
| 55 } // namespace mojo | 51 } // namespace mojo |
| OLD | NEW |