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

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

Issue 1535943002: Convert Pass()→std::move() in //mojo/public/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Regenerate correctly Created 4 years, 12 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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <utility>
9 10
10 #include "mojo/public/cpp/bindings/lib/message_builder.h" 11 #include "mojo/public/cpp/bindings/lib/message_builder.h"
11 #include "mojo/public/cpp/environment/logging.h" 12 #include "mojo/public/cpp/environment/logging.h"
12 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" 13 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
13 14
14 namespace mojo { 15 namespace mojo {
15 namespace internal { 16 namespace internal {
16 17
17 // static 18 // static
18 bool ControlMessageHandler::IsControlMessage(const Message* message) { 19 bool ControlMessageHandler::IsControlMessage(const Message* message) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 RunResponseMessageParams::New()); 52 RunResponseMessageParams::New());
52 response_params_ptr->reserved0 = 16u; 53 response_params_ptr->reserved0 = 16u;
53 response_params_ptr->reserved1 = 0u; 54 response_params_ptr->reserved1 = 0u;
54 response_params_ptr->query_version_result = QueryVersionResult::New(); 55 response_params_ptr->query_version_result = QueryVersionResult::New();
55 response_params_ptr->query_version_result->version = interface_version_; 56 response_params_ptr->query_version_result->version = interface_version_;
56 57
57 size_t size = GetSerializedSize_(response_params_ptr); 58 size_t size = GetSerializedSize_(response_params_ptr);
58 ResponseMessageBuilder builder(kRunMessageId, size, message->request_id()); 59 ResponseMessageBuilder builder(kRunMessageId, size, message->request_id());
59 60
60 RunResponseMessageParams_Data* response_params = nullptr; 61 RunResponseMessageParams_Data* response_params = nullptr;
61 Serialize_(response_params_ptr.Pass(), builder.buffer(), &response_params); 62 Serialize_(std::move(response_params_ptr), builder.buffer(),
63 &response_params);
62 response_params->EncodePointersAndHandles( 64 response_params->EncodePointersAndHandles(
63 builder.message()->mutable_handles()); 65 builder.message()->mutable_handles());
64 bool ok = responder->Accept(builder.message()); 66 bool ok = responder->Accept(builder.message());
65 MOJO_ALLOW_UNUSED_LOCAL(ok); 67 MOJO_ALLOW_UNUSED_LOCAL(ok);
66 delete responder; 68 delete responder;
67 69
68 return true; 70 return true;
69 } 71 }
70 72
71 bool ControlMessageHandler::RunOrClosePipe(Message* message) { 73 bool ControlMessageHandler::RunOrClosePipe(Message* message) {
72 RunOrClosePipeMessageParams_Data* params = 74 RunOrClosePipeMessageParams_Data* params =
73 reinterpret_cast<RunOrClosePipeMessageParams_Data*>( 75 reinterpret_cast<RunOrClosePipeMessageParams_Data*>(
74 message->mutable_payload()); 76 message->mutable_payload());
75 params->DecodePointersAndHandles(message->mutable_handles()); 77 params->DecodePointersAndHandles(message->mutable_handles());
76 78
77 RunOrClosePipeMessageParamsPtr params_ptr; 79 RunOrClosePipeMessageParamsPtr params_ptr;
78 Deserialize_(params, &params_ptr, nullptr); 80 Deserialize_(params, &params_ptr, nullptr);
79 81
80 return interface_version_ >= params_ptr->require_version->version; 82 return interface_version_ >= params_ptr->require_version->version;
81 } 83 }
82 84
83 } // namespace internal 85 } // namespace internal
84 } // namespace mojo 86 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/bindings/lib/connector.cc ('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