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

Unified 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, 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_handler.cc
diff --git a/mojo/public/cpp/bindings/lib/control_message_handler.cc b/mojo/public/cpp/bindings/lib/control_message_handler.cc
index 5113bb0203ad35a30c535a6d9992cd574662cf81..4e7efc840b55051c9b648eed4ee0feb02953370d 100644
--- a/mojo/public/cpp/bindings/lib/control_message_handler.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_handler.cc
@@ -51,11 +51,11 @@ bool ControlMessageHandler::Run(Message* message,
response_params_ptr->query_version_result = QueryVersionResult::New();
response_params_ptr->query_version_result->version = interface_version_;
- size_t size = GetSerializedSize_(response_params_ptr);
+ size_t size = GetSerializedSize_(*response_params_ptr);
ResponseMessageBuilder builder(kRunMessageId, size, message->request_id());
RunResponseMessageParams_Data* response_params = nullptr;
- Serialize_(response_params_ptr.Pass(), builder.buffer(), &response_params);
+ Serialize_(response_params_ptr.get(), builder.buffer(), &response_params);
response_params->EncodePointersAndHandles(
builder.message()->mutable_handles());
bool ok = responder->Accept(builder.message());
@@ -71,8 +71,8 @@ bool ControlMessageHandler::RunOrClosePipe(Message* message) {
message->mutable_payload());
params->DecodePointersAndHandles(message->mutable_handles());
- RunOrClosePipeMessageParamsPtr params_ptr;
- Deserialize_(params, &params_ptr);
+ RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New());
+ Deserialize_(params, params_ptr.get());
return interface_version_ >= params_ptr->require_version->version;
}
« 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