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

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

Issue 1387993002: mojo::Serialize*_() calls now propogate/return validation errors. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Cleaned up how serialization errors propagate, and addressed other comments from viettrungluu@ Created 5 years, 2 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 "mojo/public/cpp/bindings/lib/message_builder.h" 7 #include "mojo/public/cpp/bindings/lib/message_builder.h"
8 #include "mojo/public/cpp/bindings/message.h" 8 #include "mojo/public/cpp/bindings/message.h"
9 #include "mojo/public/cpp/system/macros.h" 9 #include "mojo/public/cpp/system/macros.h"
10 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" 10 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 const RunCallback& callback) { 45 const RunCallback& callback) {
46 RunMessageParamsPtr params_ptr(RunMessageParams::New()); 46 RunMessageParamsPtr params_ptr(RunMessageParams::New());
47 params_ptr->reserved0 = 16u; 47 params_ptr->reserved0 = 16u;
48 params_ptr->reserved1 = 0u; 48 params_ptr->reserved1 = 0u;
49 params_ptr->query_version = query_version.Pass(); 49 params_ptr->query_version = query_version.Pass();
50 50
51 size_t size = GetSerializedSize_(*params_ptr); 51 size_t size = GetSerializedSize_(*params_ptr);
52 RequestMessageBuilder builder(kRunMessageId, size); 52 RequestMessageBuilder builder(kRunMessageId, size);
53 53
54 RunMessageParams_Data* params = nullptr; 54 RunMessageParams_Data* params = nullptr;
55 Serialize_(params_ptr.get(), builder.buffer(), &params); 55 MOJO_DCHECK(Serialize_(params_ptr.get(), builder.buffer(), &params) ==
56 ValidationError::VALIDATION_ERROR_NONE);
56 params->EncodePointersAndHandles(builder.message()->mutable_handles()); 57 params->EncodePointersAndHandles(builder.message()->mutable_handles());
57 MessageReceiver* responder = new RunResponseForwardToCallback(callback); 58 MessageReceiver* responder = new RunResponseForwardToCallback(callback);
58 if (!receiver->AcceptWithResponder(builder.message(), responder)) 59 if (!receiver->AcceptWithResponder(builder.message(), responder))
59 delete responder; 60 delete responder;
60 } 61 }
61 62
62 void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver, 63 void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver,
63 RequireVersionPtr require_version) { 64 RequireVersionPtr require_version) {
64 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New()); 65 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New());
65 params_ptr->reserved0 = 16u; 66 params_ptr->reserved0 = 16u;
66 params_ptr->reserved1 = 0u; 67 params_ptr->reserved1 = 0u;
67 params_ptr->require_version = require_version.Pass(); 68 params_ptr->require_version = require_version.Pass();
68 69
69 size_t size = GetSerializedSize_(*params_ptr); 70 size_t size = GetSerializedSize_(*params_ptr);
70 MessageBuilder builder(kRunOrClosePipeMessageId, size); 71 MessageBuilder builder(kRunOrClosePipeMessageId, size);
71 72
72 RunOrClosePipeMessageParams_Data* params = nullptr; 73 RunOrClosePipeMessageParams_Data* params = nullptr;
73 Serialize_(params_ptr.get(), builder.buffer(), &params); 74 MOJO_DCHECK(Serialize_(params_ptr.get(), builder.buffer(), &params) ==
75 ValidationError::VALIDATION_ERROR_NONE);
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_, require_version.Pass());
97 } 99 }
98 100
99 } // namespace internal 101 } // namespace internal
100 } // namespace mojo 102 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698