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

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

Issue 2064903002: Mojo: Report bindings validation errors via MojoNotifyBadMessage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 6 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_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 #include <utility>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "mojo/public/cpp/bindings/lib/message_builder.h" 12 #include "mojo/public/cpp/bindings/lib/message_builder.h"
13 #include "mojo/public/cpp/bindings/lib/serialization.h" 13 #include "mojo/public/cpp/bindings/lib/serialization.h"
14 #include "mojo/public/cpp/bindings/message.h" 14 #include "mojo/public/cpp/bindings/message.h"
15 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" 15 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
16 16
17 namespace mojo { 17 namespace mojo {
18 namespace internal { 18 namespace internal {
19 19
20 namespace { 20 namespace {
21 21
22 using RunCallback = Callback<void(QueryVersionResultPtr)>; 22 using RunCallback = Callback<void(QueryVersionResultPtr)>;
23 23
24 class RunResponseForwardToCallback : public MessageReceiver { 24 class RunResponseForwardToCallback : public MessageReceiver {
25 public: 25 public:
26 RunResponseForwardToCallback(const RunCallback& callback) 26 RunResponseForwardToCallback(const RunCallback& callback)
27 : callback_(callback) {} 27 : callback_(callback) {}
28 bool Accept(Message* message) override; 28 Result Accept(Message* message) override;
29 29
30 private: 30 private:
31 RunCallback callback_; 31 RunCallback callback_;
32 DISALLOW_COPY_AND_ASSIGN(RunResponseForwardToCallback); 32 DISALLOW_COPY_AND_ASSIGN(RunResponseForwardToCallback);
33 }; 33 };
34 34
35 bool RunResponseForwardToCallback::Accept(Message* message) { 35 MessageReceiver::Result RunResponseForwardToCallback::Accept(Message* message) {
36 RunResponseMessageParams_Data* params = 36 RunResponseMessageParams_Data* params =
37 reinterpret_cast<RunResponseMessageParams_Data*>( 37 reinterpret_cast<RunResponseMessageParams_Data*>(
38 message->mutable_payload()); 38 message->mutable_payload());
39 params->DecodePointers(); 39 params->DecodePointers();
40 40
41 RunResponseMessageParamsPtr params_ptr; 41 RunResponseMessageParamsPtr params_ptr;
42 SerializationContext context; 42 SerializationContext context;
43 Deserialize<RunResponseMessageParamsPtr>(params, &params_ptr, &context); 43 Deserialize<RunResponseMessageParamsPtr>(params, &params_ptr, &context);
44 44
45 callback_.Run(std::move(params_ptr->query_version_result)); 45 callback_.Run(std::move(params_ptr->query_version_result));
46 return true; 46 return Result::ForSuccess();
47 } 47 }
48 48
49 void SendRunMessage(MessageReceiverWithResponder* receiver, 49 void SendRunMessage(MessageReceiverWithResponder* receiver,
50 QueryVersionPtr query_version, 50 QueryVersionPtr query_version,
51 const RunCallback& callback, 51 const RunCallback& callback,
52 SerializationContext* context) { 52 SerializationContext* context) {
53 RunMessageParamsPtr params_ptr(RunMessageParams::New()); 53 RunMessageParamsPtr params_ptr(RunMessageParams::New());
54 params_ptr->reserved0 = 16u; 54 params_ptr->reserved0 = 16u;
55 params_ptr->reserved1 = 0u; 55 params_ptr->reserved1 = 0u;
56 params_ptr->query_version = std::move(query_version); 56 params_ptr->query_version = std::move(query_version);
57 57
58 size_t size = PrepareToSerialize<RunMessageParamsPtr>(params_ptr, context); 58 size_t size = PrepareToSerialize<RunMessageParamsPtr>(params_ptr, context);
59 RequestMessageBuilder builder(kRunMessageId, size); 59 RequestMessageBuilder builder(kRunMessageId, size);
60 60
61 RunMessageParams_Data* params = nullptr; 61 RunMessageParams_Data* params = nullptr;
62 Serialize<RunMessageParamsPtr>(params_ptr, builder.buffer(), &params, 62 Serialize<RunMessageParamsPtr>(params_ptr, builder.buffer(), &params,
63 context); 63 context);
64 params->EncodePointers(); 64 params->EncodePointers();
65 MessageReceiver* responder = new RunResponseForwardToCallback(callback); 65 MessageReceiver* responder = new RunResponseForwardToCallback(callback);
66 if (!receiver->AcceptWithResponder(builder.message(), responder)) 66 if (!receiver->AcceptWithResponder(builder.message(), responder).Succeeded())
67 delete responder; 67 delete responder;
68 } 68 }
69 69
70 void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver, 70 void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver,
71 RequireVersionPtr require_version, 71 RequireVersionPtr require_version,
72 SerializationContext* context) { 72 SerializationContext* context) {
73 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New()); 73 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New());
74 params_ptr->reserved0 = 16u; 74 params_ptr->reserved0 = 16u;
75 params_ptr->reserved1 = 0u; 75 params_ptr->reserved1 = 0u;
76 params_ptr->require_version = std::move(require_version); 76 params_ptr->require_version = std::move(require_version);
77 77
78 size_t size = 78 size_t size =
79 PrepareToSerialize<RunOrClosePipeMessageParamsPtr>(params_ptr, context); 79 PrepareToSerialize<RunOrClosePipeMessageParamsPtr>(params_ptr, context);
80 MessageBuilder builder(kRunOrClosePipeMessageId, size); 80 MessageBuilder builder(kRunOrClosePipeMessageId, size);
81 81
82 RunOrClosePipeMessageParams_Data* params = nullptr; 82 RunOrClosePipeMessageParams_Data* params = nullptr;
83 Serialize<RunOrClosePipeMessageParamsPtr>(params_ptr, builder.buffer(), 83 Serialize<RunOrClosePipeMessageParamsPtr>(params_ptr, builder.buffer(),
84 &params, context); 84 &params, context);
85 params->EncodePointers(); 85 params->EncodePointers();
86 bool ok = receiver->Accept(builder.message()); 86 ignore_result(receiver->Accept(builder.message()));
87 ALLOW_UNUSED_LOCAL(ok);
88 } 87 }
89 88
90 } // namespace 89 } // namespace
91 90
92 ControlMessageProxy::ControlMessageProxy(MessageReceiverWithResponder* receiver) 91 ControlMessageProxy::ControlMessageProxy(MessageReceiverWithResponder* receiver)
93 : receiver_(receiver) { 92 : receiver_(receiver) {
94 } 93 }
95 94
96 void ControlMessageProxy::QueryVersion( 95 void ControlMessageProxy::QueryVersion(
97 const Callback<void(uint32_t)>& callback) { 96 const Callback<void(uint32_t)>& callback) {
98 auto run_callback = [callback](QueryVersionResultPtr query_version_result) { 97 auto run_callback = [callback](QueryVersionResultPtr query_version_result) {
99 callback.Run(query_version_result->version); 98 callback.Run(query_version_result->version);
100 }; 99 };
101 SendRunMessage(receiver_, QueryVersion::New(), run_callback, &context_); 100 SendRunMessage(receiver_, QueryVersion::New(), run_callback, &context_);
102 } 101 }
103 102
104 void ControlMessageProxy::RequireVersion(uint32_t version) { 103 void ControlMessageProxy::RequireVersion(uint32_t version) {
105 RequireVersionPtr require_version(RequireVersion::New()); 104 RequireVersionPtr require_version(RequireVersion::New());
106 require_version->version = version; 105 require_version->version = version;
107 SendRunOrClosePipeMessage(receiver_, std::move(require_version), &context_); 106 SendRunOrClosePipeMessage(receiver_, std::move(require_version), &context_);
108 } 107 }
109 108
110 } // namespace internal 109 } // namespace internal
111 } // namespace mojo 110 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698