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

Side by Side Diff: mojo/public/cpp/bindings/lib/message_builder.cc

Issue 1460463003: Move mojo::internal::MessageBuilder out of the |internal| namespace. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
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/lib/bindings_serialization.h" 7 #include "mojo/public/cpp/bindings/lib/bindings_serialization.h"
8 #include "mojo/public/cpp/bindings/message.h" 8 #include "mojo/public/cpp/bindings/message.h"
9 9
10 namespace mojo { 10 namespace mojo {
11 namespace internal { 11
viettrungluu 2015/11/18 23:55:59 It's debatable if you should delete this blank lin
12 namespace {
13
viettrungluu 2015/11/18 23:55:59 So you shouldn't delete this blank line.
14 using internal::MessageHeader;
15 using internal::MessageHeaderWithRequestID;
12 16
13 template <typename Header> 17 template <typename Header>
14 void Allocate(Buffer* buf, Header** header) { 18 void Allocate(internal::Buffer* buf, Header** header) {
15 *header = static_cast<Header*>(buf->Allocate(sizeof(Header))); 19 *header = static_cast<Header*>(buf->Allocate(sizeof(Header)));
16 (*header)->num_bytes = sizeof(Header); 20 (*header)->num_bytes = sizeof(Header);
17 } 21 }
18 22
23 } // namespace
24
19 MessageBuilder::MessageBuilder(uint32_t name, size_t payload_size) { 25 MessageBuilder::MessageBuilder(uint32_t name, size_t payload_size) {
20 Initialize(sizeof(MessageHeader) + payload_size); 26 Initialize(sizeof(MessageHeader) + payload_size);
21 27
22 MessageHeader* header; 28 MessageHeader* header;
23 Allocate(&buf_, &header); 29 Allocate(&buf_, &header);
24 header->version = 0; 30 header->version = 0;
25 header->name = name; 31 header->name = name;
32 header->flags = 0;
viettrungluu 2015/11/17 23:59:38 I guess Allocate() (that is, internal::Buffer::All
vardhan 2015/11/18 22:46:40 I think it's because we should explicitly set a de
viettrungluu 2015/11/18 23:55:59 (I wasn't actually disagreeing with setting it exp
26 } 33 }
27 34
28 MessageBuilder::~MessageBuilder() { 35 MessageBuilder::~MessageBuilder() {
29 } 36 }
30 37
31 MessageBuilder::MessageBuilder() {} 38 MessageBuilder::MessageBuilder() {}
32 39
33 void MessageBuilder::Initialize(size_t size) { 40 void MessageBuilder::Initialize(size_t size) {
34 message_.AllocData(static_cast<uint32_t>(Align(size))); 41 message_.AllocData(static_cast<uint32_t>(internal::Align(size)));
35 buf_.Initialize(message_.mutable_data(), message_.data_num_bytes()); 42 buf_.Initialize(message_.mutable_data(), message_.data_num_bytes());
36 } 43 }
37 44
38 MessageWithRequestIDBuilder::MessageWithRequestIDBuilder(uint32_t name, 45 MessageWithRequestIDBuilder::MessageWithRequestIDBuilder(uint32_t name,
39 size_t payload_size, 46 size_t payload_size,
40 uint32_t flags, 47 uint32_t flags,
41 uint64_t request_id) { 48 uint64_t request_id) {
42 Initialize(sizeof(MessageHeaderWithRequestID) + payload_size); 49 Initialize(sizeof(MessageHeaderWithRequestID) + payload_size);
43 MessageHeaderWithRequestID* header; 50 MessageHeaderWithRequestID* header;
44 Allocate(&buf_, &header); 51 Allocate(&buf_, &header);
45 header->version = 1; 52 header->version = 1;
46 header->name = name; 53 header->name = name;
47 header->flags = flags; 54 header->flags = flags;
48 header->request_id = request_id; 55 header->request_id = request_id;
49 } 56 }
50 57
51 } // namespace internal
52 } // namespace mojo 58 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698