| OLD | NEW |
| 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_proxy.h" | 5 #include "mojo/public/cpp/bindings/lib/control_message_proxy.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/bindings/message.h" | 10 #include "mojo/public/cpp/bindings/message.h" |
| 9 #include "mojo/public/cpp/system/macros.h" | 11 #include "mojo/public/cpp/system/macros.h" |
| 10 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" | 12 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" |
| 11 | 13 |
| 12 namespace mojo { | 14 namespace mojo { |
| 13 namespace internal { | 15 namespace internal { |
| 14 | 16 |
| 15 namespace { | 17 namespace { |
| 16 | 18 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 29 | 31 |
| 30 bool RunResponseForwardToCallback::Accept(Message* message) { | 32 bool RunResponseForwardToCallback::Accept(Message* message) { |
| 31 RunResponseMessageParams_Data* params = | 33 RunResponseMessageParams_Data* params = |
| 32 reinterpret_cast<RunResponseMessageParams_Data*>( | 34 reinterpret_cast<RunResponseMessageParams_Data*>( |
| 33 message->mutable_payload()); | 35 message->mutable_payload()); |
| 34 params->DecodePointersAndHandles(message->mutable_handles()); | 36 params->DecodePointersAndHandles(message->mutable_handles()); |
| 35 | 37 |
| 36 RunResponseMessageParamsPtr params_ptr; | 38 RunResponseMessageParamsPtr params_ptr; |
| 37 Deserialize_(params, ¶ms_ptr, nullptr); | 39 Deserialize_(params, ¶ms_ptr, nullptr); |
| 38 | 40 |
| 39 callback_.Run(params_ptr->query_version_result.Pass()); | 41 callback_.Run(std::move(params_ptr->query_version_result)); |
| 40 return true; | 42 return true; |
| 41 } | 43 } |
| 42 | 44 |
| 43 void SendRunMessage(MessageReceiverWithResponder* receiver, | 45 void SendRunMessage(MessageReceiverWithResponder* receiver, |
| 44 QueryVersionPtr query_version, | 46 QueryVersionPtr query_version, |
| 45 const RunCallback& callback) { | 47 const RunCallback& callback) { |
| 46 RunMessageParamsPtr params_ptr(RunMessageParams::New()); | 48 RunMessageParamsPtr params_ptr(RunMessageParams::New()); |
| 47 params_ptr->reserved0 = 16u; | 49 params_ptr->reserved0 = 16u; |
| 48 params_ptr->reserved1 = 0u; | 50 params_ptr->reserved1 = 0u; |
| 49 params_ptr->query_version = query_version.Pass(); | 51 params_ptr->query_version = std::move(query_version); |
| 50 | 52 |
| 51 size_t size = GetSerializedSize_(params_ptr); | 53 size_t size = GetSerializedSize_(params_ptr); |
| 52 RequestMessageBuilder builder(kRunMessageId, size); | 54 RequestMessageBuilder builder(kRunMessageId, size); |
| 53 | 55 |
| 54 RunMessageParams_Data* params = nullptr; | 56 RunMessageParams_Data* params = nullptr; |
| 55 Serialize_(params_ptr.Pass(), builder.buffer(), ¶ms); | 57 Serialize_(std::move(params_ptr), builder.buffer(), ¶ms); |
| 56 params->EncodePointersAndHandles(builder.message()->mutable_handles()); | 58 params->EncodePointersAndHandles(builder.message()->mutable_handles()); |
| 57 MessageReceiver* responder = new RunResponseForwardToCallback(callback); | 59 MessageReceiver* responder = new RunResponseForwardToCallback(callback); |
| 58 if (!receiver->AcceptWithResponder(builder.message(), responder)) | 60 if (!receiver->AcceptWithResponder(builder.message(), responder)) |
| 59 delete responder; | 61 delete responder; |
| 60 } | 62 } |
| 61 | 63 |
| 62 void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver, | 64 void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver, |
| 63 RequireVersionPtr require_version) { | 65 RequireVersionPtr require_version) { |
| 64 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New()); | 66 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New()); |
| 65 params_ptr->reserved0 = 16u; | 67 params_ptr->reserved0 = 16u; |
| 66 params_ptr->reserved1 = 0u; | 68 params_ptr->reserved1 = 0u; |
| 67 params_ptr->require_version = require_version.Pass(); | 69 params_ptr->require_version = std::move(require_version); |
| 68 | 70 |
| 69 size_t size = GetSerializedSize_(params_ptr); | 71 size_t size = GetSerializedSize_(params_ptr); |
| 70 MessageBuilder builder(kRunOrClosePipeMessageId, size); | 72 MessageBuilder builder(kRunOrClosePipeMessageId, size); |
| 71 | 73 |
| 72 RunOrClosePipeMessageParams_Data* params = nullptr; | 74 RunOrClosePipeMessageParams_Data* params = nullptr; |
| 73 Serialize_(params_ptr.Pass(), builder.buffer(), ¶ms); | 75 Serialize_(std::move(params_ptr), builder.buffer(), ¶ms); |
| 74 params->EncodePointersAndHandles(builder.message()->mutable_handles()); | 76 params->EncodePointersAndHandles(builder.message()->mutable_handles()); |
| 75 bool ok = receiver->Accept(builder.message()); | 77 bool ok = receiver->Accept(builder.message()); |
| 76 MOJO_ALLOW_UNUSED_LOCAL(ok); | 78 MOJO_ALLOW_UNUSED_LOCAL(ok); |
| 77 } | 79 } |
| 78 | 80 |
| 79 } // namespace | 81 } // namespace |
| 80 | 82 |
| 81 ControlMessageProxy::ControlMessageProxy(MessageReceiverWithResponder* receiver) | 83 ControlMessageProxy::ControlMessageProxy(MessageReceiverWithResponder* receiver) |
| 82 : receiver_(receiver) { | 84 : receiver_(receiver) { |
| 83 } | 85 } |
| 84 | 86 |
| 85 void ControlMessageProxy::QueryVersion( | 87 void ControlMessageProxy::QueryVersion( |
| 86 const Callback<void(uint32_t)>& callback) { | 88 const Callback<void(uint32_t)>& callback) { |
| 87 auto run_callback = [callback](QueryVersionResultPtr query_version_result) { | 89 auto run_callback = [callback](QueryVersionResultPtr query_version_result) { |
| 88 callback.Run(query_version_result->version); | 90 callback.Run(query_version_result->version); |
| 89 }; | 91 }; |
| 90 SendRunMessage(receiver_, QueryVersion::New(), run_callback); | 92 SendRunMessage(receiver_, QueryVersion::New(), run_callback); |
| 91 } | 93 } |
| 92 | 94 |
| 93 void ControlMessageProxy::RequireVersion(uint32_t version) { | 95 void ControlMessageProxy::RequireVersion(uint32_t version) { |
| 94 RequireVersionPtr require_version(RequireVersion::New()); | 96 RequireVersionPtr require_version(RequireVersion::New()); |
| 95 require_version->version = version; | 97 require_version->version = version; |
| 96 SendRunOrClosePipeMessage(receiver_, require_version.Pass()); | 98 SendRunOrClosePipeMessage(receiver_, std::move(require_version)); |
| 97 } | 99 } |
| 98 | 100 |
| 99 } // namespace internal | 101 } // namespace internal |
| 100 } // namespace mojo | 102 } // namespace mojo |
| OLD | NEW |