| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 6273518135046463afc926d0c4530781fcf7bf50..47e05b5b9bb8b055d784560333a449d45adeed6e 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -3425,19 +3425,8 @@ bool RenderFrameImpl::willCheckAndDispatchMessageEvent(
|
| if (!target_origin.isNull())
|
| params.target_origin = target_origin.toString();
|
|
|
| - blink::WebMessagePortChannelArray channels = event.releaseChannels();
|
| - if (!channels.isEmpty()) {
|
| - std::vector<int> message_port_ids(channels.size());
|
| - // Extract the port IDs from the channel array.
|
| - for (size_t i = 0; i < channels.size(); ++i) {
|
| - WebMessagePortChannelImpl* webchannel =
|
| - static_cast<WebMessagePortChannelImpl*>(channels[i]);
|
| - message_port_ids[i] = webchannel->message_port_id();
|
| - webchannel->QueueMessages();
|
| - DCHECK_NE(message_port_ids[i], MSG_ROUTING_NONE);
|
| - }
|
| - params.message_port_ids = message_port_ids;
|
| - }
|
| + params.message_ports =
|
| + WebMessagePortChannelImpl::ExtractMessagePortIDs(event.releaseChannels());
|
|
|
| // Include the routing ID for the source frame (if one exists), which the
|
| // browser process will translate into the routing ID for the equivalent
|
|
|