Commit ea420fb9 authored by David Dorwin's avatar David Dorwin Committed by Commit Bot

[fuchsia] Improve BlinkMessageFromFidl() input handling

Addresses post-commit feedback in https://crrev.com/c/2430302.

Bug: 1104369
Change-Id: Id4024d55445a10e9b5cf1770ffd71829ecb7833b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436381Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: David Dorwin <ddorwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812852}
parent 30261f9d
...@@ -49,14 +49,18 @@ base::Optional<fuchsia::web::FrameError> BlinkMessageFromFidl( ...@@ -49,14 +49,18 @@ base::Optional<fuchsia::web::FrameError> BlinkMessageFromFidl(
if (fidl_message.has_outgoing_transfer()) { if (fidl_message.has_outgoing_transfer()) {
for (fuchsia::web::OutgoingTransferable& transferrable : for (fuchsia::web::OutgoingTransferable& transferrable :
*fidl_message.mutable_outgoing_transfer()) { *fidl_message.mutable_outgoing_transfer()) {
if (!transferrable.is_message_port())
return fuchsia::web::FrameError::INTERNAL_ERROR;
blink_message->ports.push_back( blink_message->ports.push_back(
BlinkMessagePortFromFidl(std::move(transferrable.message_port()))); BlinkMessagePortFromFidl(std::move(transferrable.message_port())));
} }
} else if (fidl_message.has_incoming_transfer()) { } else if (fidl_message.has_incoming_transfer()) {
for (fuchsia::web::IncomingTransferable& incoming : for (fuchsia::web::IncomingTransferable& transferrable :
*fidl_message.mutable_incoming_transfer()) { *fidl_message.mutable_incoming_transfer()) {
if (!transferrable.is_message_port())
return fuchsia::web::FrameError::INTERNAL_ERROR;
blink_message->ports.push_back( blink_message->ports.push_back(
BlinkMessagePortFromFidl(std::move(incoming.message_port()))); BlinkMessagePortFromFidl(std::move(transferrable.message_port())));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment