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

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: Remove self-move checks to avoid triggering clang warning. Created 5 years 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 <utility>
8
7 #include "mojo/public/cpp/bindings/lib/message_builder.h" 9 #include "mojo/public/cpp/bindings/lib/message_builder.h"
8 #include "mojo/public/cpp/environment/logging.h" 10 #include "mojo/public/cpp/environment/logging.h"
9 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" 11 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
10 12
11 namespace mojo { 13 namespace mojo {
12 namespace internal { 14 namespace internal {
13 15
14 // static 16 // static
15 bool ControlMessageHandler::IsControlMessage(const Message* message) { 17 bool ControlMessageHandler::IsControlMessage(const Message* message) {
16 return message->header()->name == kRunMessageId || 18 return message->header()->name == kRunMessageId ||
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 RunResponseMessageParams::New()); 50 RunResponseMessageParams::New());
49 response_params_ptr->reserved0 = 16u; 51 response_params_ptr->reserved0 = 16u;
50 response_params_ptr->reserved1 = 0u; 52 response_params_ptr->reserved1 = 0u;
51 response_params_ptr->query_version_result = QueryVersionResult::New(); 53 response_params_ptr->query_version_result = QueryVersionResult::New();
52 response_params_ptr->query_version_result->version = interface_version_; 54 response_params_ptr->query_version_result->version = interface_version_;
53 55
54 size_t size = GetSerializedSize_(response_params_ptr); 56 size_t size = GetSerializedSize_(response_params_ptr);
55 ResponseMessageBuilder builder(kRunMessageId, size, message->request_id()); 57 ResponseMessageBuilder builder(kRunMessageId, size, message->request_id());
56 58
57 RunResponseMessageParams_Data* response_params = nullptr; 59 RunResponseMessageParams_Data* response_params = nullptr;
58 Serialize_(response_params_ptr.Pass(), builder.buffer(), &response_params); 60 Serialize_(std::move(response_params_ptr), builder.buffer(),
61 &response_params);
59 response_params->EncodePointersAndHandles( 62 response_params->EncodePointersAndHandles(
60 builder.message()->mutable_handles()); 63 builder.message()->mutable_handles());
61 bool ok = responder->Accept(builder.message()); 64 bool ok = responder->Accept(builder.message());
62 MOJO_ALLOW_UNUSED_LOCAL(ok); 65 MOJO_ALLOW_UNUSED_LOCAL(ok);
63 delete responder; 66 delete responder;
64 67
65 return true; 68 return true;
66 } 69 }
67 70
68 bool ControlMessageHandler::RunOrClosePipe(Message* message) { 71 bool ControlMessageHandler::RunOrClosePipe(Message* message) {
69 RunOrClosePipeMessageParams_Data* params = 72 RunOrClosePipeMessageParams_Data* params =
70 reinterpret_cast<RunOrClosePipeMessageParams_Data*>( 73 reinterpret_cast<RunOrClosePipeMessageParams_Data*>(
71 message->mutable_payload()); 74 message->mutable_payload());
72 params->DecodePointersAndHandles(message->mutable_handles()); 75 params->DecodePointersAndHandles(message->mutable_handles());
73 76
74 RunOrClosePipeMessageParamsPtr params_ptr; 77 RunOrClosePipeMessageParamsPtr params_ptr;
75 Deserialize_(params, &params_ptr, nullptr); 78 Deserialize_(params, &params_ptr, nullptr);
76 79
77 return interface_version_ >= params_ptr->require_version->version; 80 return interface_version_ >= params_ptr->require_version->version;
78 } 81 }
79 82
80 } // namespace internal 83 } // namespace internal
81 } // namespace mojo 84 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698