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