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

Unified Diff: mojo/public/cpp/bindings/lib/control_message_proxy.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, 3 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 side-by-side diff with in-line comments
Download patch
Index: mojo/public/cpp/bindings/lib/control_message_proxy.cc
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
index ad729c5de2ed04cd67233289188c41f3166ac1da..ee1e695bbd2d86bbf304f3d4a58dcda9d97fca7f 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -33,8 +33,8 @@ bool RunResponseForwardToCallback::Accept(Message* message) {
message->mutable_payload());
params->DecodePointersAndHandles(message->mutable_handles());
- RunResponseMessageParamsPtr params_ptr;
- Deserialize_(params, &params_ptr);
+ RunResponseMessageParamsPtr params_ptr(RunResponseMessageParams::New());
+ Deserialize_(params, params_ptr.get());
callback_.Run(params_ptr->query_version_result.Pass());
return true;
@@ -48,11 +48,11 @@ void SendRunMessage(MessageReceiverWithResponder* receiver,
params_ptr->reserved1 = 0u;
params_ptr->query_version = query_version.Pass();
- size_t size = GetSerializedSize_(params_ptr);
+ size_t size = GetSerializedSize_(*params_ptr);
RequestMessageBuilder builder(kRunMessageId, size);
RunMessageParams_Data* params = nullptr;
- Serialize_(params_ptr.Pass(), builder.buffer(), &params);
+ Serialize_(params_ptr.get(), builder.buffer(), &params);
params->EncodePointersAndHandles(builder.message()->mutable_handles());
MessageReceiver* responder = new RunResponseForwardToCallback(callback);
if (!receiver->AcceptWithResponder(builder.message(), responder))
@@ -66,11 +66,11 @@ void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver,
params_ptr->reserved1 = 0u;
params_ptr->require_version = require_version.Pass();
- size_t size = GetSerializedSize_(params_ptr);
+ size_t size = GetSerializedSize_(*params_ptr);
MessageBuilder builder(kRunOrClosePipeMessageId, size);
RunOrClosePipeMessageParams_Data* params = nullptr;
- Serialize_(params_ptr.Pass(), builder.buffer(), &params);
+ Serialize_(params_ptr.get(), builder.buffer(), &params);
params->EncodePointersAndHandles(builder.message()->mutable_handles());
bool ok = receiver->Accept(builder.message());
MOJO_ALLOW_UNUSED_LOCAL(ok);
« no previous file with comments | « mojo/public/cpp/bindings/lib/control_message_handler.cc ('k') | mojo/public/cpp/bindings/lib/map_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698