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

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

Issue 1358353002: * Change C++ serialization/deserialization to not be move-only operations (with the except of |Ha… (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: (*it).get() to it->, and other formatting Created 5 years, 2 months 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/control_message_handler.h" 5 #include "mojo/public/cpp/bindings/lib/control_message_handler.h"
6 6
7 #include "mojo/public/cpp/bindings/lib/message_builder.h" 7 #include "mojo/public/cpp/bindings/lib/message_builder.h"
8 #include "mojo/public/cpp/environment/logging.h" 8 #include "mojo/public/cpp/environment/logging.h"
9 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" 9 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 bool ControlMessageHandler::Run(Message* message, 45 bool ControlMessageHandler::Run(Message* message,
46 MessageReceiverWithStatus* responder) { 46 MessageReceiverWithStatus* responder) {
47 RunResponseMessageParamsPtr response_params_ptr( 47 RunResponseMessageParamsPtr response_params_ptr(
48 RunResponseMessageParams::New()); 48 RunResponseMessageParams::New());
49 response_params_ptr->reserved0 = 16u; 49 response_params_ptr->reserved0 = 16u;
50 response_params_ptr->reserved1 = 0u; 50 response_params_ptr->reserved1 = 0u;
51 response_params_ptr->query_version_result = QueryVersionResult::New(); 51 response_params_ptr->query_version_result = QueryVersionResult::New();
52 response_params_ptr->query_version_result->version = interface_version_; 52 response_params_ptr->query_version_result->version = interface_version_;
53 53
54 size_t size = GetSerializedSize_(response_params_ptr); 54 size_t size = GetSerializedSize_(*response_params_ptr);
55 ResponseMessageBuilder builder(kRunMessageId, size, message->request_id()); 55 ResponseMessageBuilder builder(kRunMessageId, size, message->request_id());
56 56
57 RunResponseMessageParams_Data* response_params = nullptr; 57 RunResponseMessageParams_Data* response_params = nullptr;
58 Serialize_(response_params_ptr.Pass(), builder.buffer(), &response_params); 58 Serialize_(response_params_ptr.get(), builder.buffer(), &response_params);
59 response_params->EncodePointersAndHandles( 59 response_params->EncodePointersAndHandles(
60 builder.message()->mutable_handles()); 60 builder.message()->mutable_handles());
61 bool ok = responder->Accept(builder.message()); 61 bool ok = responder->Accept(builder.message());
62 MOJO_ALLOW_UNUSED_LOCAL(ok); 62 MOJO_ALLOW_UNUSED_LOCAL(ok);
63 delete responder; 63 delete responder;
64 64
65 return true; 65 return true;
66 } 66 }
67 67
68 bool ControlMessageHandler::RunOrClosePipe(Message* message) { 68 bool ControlMessageHandler::RunOrClosePipe(Message* message) {
69 RunOrClosePipeMessageParams_Data* params = 69 RunOrClosePipeMessageParams_Data* params =
70 reinterpret_cast<RunOrClosePipeMessageParams_Data*>( 70 reinterpret_cast<RunOrClosePipeMessageParams_Data*>(
71 message->mutable_payload()); 71 message->mutable_payload());
72 params->DecodePointersAndHandles(message->mutable_handles()); 72 params->DecodePointersAndHandles(message->mutable_handles());
73 73
74 RunOrClosePipeMessageParamsPtr params_ptr; 74 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New());
75 Deserialize_(params, &params_ptr); 75 Deserialize_(params, params_ptr.get());
76 76
77 return interface_version_ >= params_ptr->require_version->version; 77 return interface_version_ >= params_ptr->require_version->version;
78 } 78 }
79 79
80 } // namespace internal 80 } // namespace internal
81 } // namespace mojo 81 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/bindings/lib/bindings_internal.h ('k') | mojo/public/cpp/bindings/lib/control_message_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698