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

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: More comments for MessageBuilder + a unittest. 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 namespace {
12 using internal::MessageHeader;
13 using internal::MessageHeaderWithRequestID;
12 14
13 template <typename Header> 15 template <typename Header>
14 void Allocate(Buffer* buf, Header** header) { 16 void Allocate(internal::Buffer* buf, Header** header) {
15 *header = static_cast<Header*>(buf->Allocate(sizeof(Header))); 17 *header = static_cast<Header*>(buf->Allocate(sizeof(Header)));
16 (*header)->num_bytes = sizeof(Header); 18 (*header)->num_bytes = sizeof(Header);
17 } 19 }
20 } // namespace
viettrungluu 2015/11/18 23:55:59 And there should be a blank line before this.
21
22 namespace internal {
23 MessageWithRequestIDBuilder::MessageWithRequestIDBuilder(uint32_t name,
24 size_t payload_size,
25 uint32_t flags,
26 uint64_t request_id) {
27 Initialize(sizeof(MessageHeaderWithRequestID) + payload_size);
28 MessageHeaderWithRequestID* header;
29 Allocate(&buf_, &header);
30 header->version = 1;
31 header->name = name;
32 header->flags = flags;
33 header->request_id = request_id;
34 }
35 } // namespace internal
18 36
19 MessageBuilder::MessageBuilder(uint32_t name, size_t payload_size) { 37 MessageBuilder::MessageBuilder(uint32_t name, size_t payload_size) {
20 Initialize(sizeof(MessageHeader) + payload_size); 38 Initialize(sizeof(MessageHeader) + payload_size);
21 39
22 MessageHeader* header; 40 MessageHeader* header;
23 Allocate(&buf_, &header); 41 Allocate(&buf_, &header);
24 header->version = 0; 42 header->version = 0;
25 header->name = name; 43 header->name = name;
44 header->flags = 0;
26 } 45 }
27 46
28 MessageBuilder::~MessageBuilder() { 47 MessageBuilder::~MessageBuilder() {
29 } 48 }
30 49
31 MessageBuilder::MessageBuilder() {} 50 MessageBuilder::MessageBuilder() {}
32 51
33 void MessageBuilder::Initialize(size_t size) { 52 void MessageBuilder::Initialize(size_t size) {
34 message_.AllocData(static_cast<uint32_t>(Align(size))); 53 message_.AllocData(static_cast<uint32_t>(internal::Align(size)));
35 buf_.Initialize(message_.mutable_data(), message_.data_num_bytes()); 54 buf_.Initialize(message_.mutable_data(), message_.data_num_bytes());
36 } 55 }
37
38 MessageWithRequestIDBuilder::MessageWithRequestIDBuilder(uint32_t name,
39 size_t payload_size,
40 uint32_t flags,
41 uint64_t request_id) {
42 Initialize(sizeof(MessageHeaderWithRequestID) + payload_size);
43 MessageHeaderWithRequestID* header;
44 Allocate(&buf_, &header);
45 header->version = 1;
46 header->name = name;
47 header->flags = flags;
48 header->request_id = request_id;
49 }
50
51 } // namespace internal
52 } // namespace mojo 56 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698