Commit 81724fb3 authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Switch RTCPeerConnectionHandlerClient away from WebVector

BUG=787254
R=guidou@chromium.org

Change-Id: I642e78ab921ab119b9cb6f4643b03aea00ee975f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1969691Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#726111}
parent cdd428e5
......@@ -54,9 +54,8 @@ class MockRTCPeerConnectionHandlerClient
MOCK_METHOD1(DidModifySctpTransport,
void(blink::WebRTCSctpTransportSnapshot snapshot));
void DidModifyTransceivers(
blink::WebVector<std::unique_ptr<RTCRtpTransceiverPlatform>>
platform_transceivers,
WebVector<uintptr_t> removed_transceivers,
Vector<std::unique_ptr<RTCRtpTransceiverPlatform>> platform_transceivers,
Vector<uintptr_t> removed_transceivers,
bool is_remote_description) override {
DidModifyTransceiversForMock(&platform_transceivers, is_remote_description);
}
......@@ -71,10 +70,8 @@ class MockRTCPeerConnectionHandlerClient
void(std::unique_ptr<RTCRtpReceiverPlatform>*));
MOCK_METHOD1(DidRemoveReceiverPlanBForMock,
void(std::unique_ptr<RTCRtpReceiverPlatform>*));
MOCK_METHOD2(
DidModifyTransceiversForMock,
void(blink::WebVector<std::unique_ptr<RTCRtpTransceiverPlatform>>*,
bool));
MOCK_METHOD2(DidModifyTransceiversForMock,
void(Vector<std::unique_ptr<RTCRtpTransceiverPlatform>>*, bool));
void didGenerateICECandidateWorker(RTCIceCandidatePlatform* candidate);
void didAddReceiverWorker(
......
......@@ -2864,8 +2864,8 @@ void RTCPeerConnection::DidModifySctpTransport(
}
void RTCPeerConnection::DidModifyTransceivers(
WebVector<std::unique_ptr<RTCRtpTransceiverPlatform>> platform_transceivers,
WebVector<uintptr_t> removed_transceiver_ids,
Vector<std::unique_ptr<RTCRtpTransceiverPlatform>> platform_transceivers,
Vector<uintptr_t> removed_transceiver_ids,
bool is_remote_description) {
for (auto id : removed_transceiver_ids) {
for (auto* it = transceivers_.begin(); it != transceivers_.end(); ++it) {
......
......@@ -310,10 +310,9 @@ class MODULES_EXPORT RTCPeerConnection final
void DidAddReceiverPlanB(std::unique_ptr<RTCRtpReceiverPlatform>) override;
void DidRemoveReceiverPlanB(std::unique_ptr<RTCRtpReceiverPlatform>) override;
void DidModifySctpTransport(WebRTCSctpTransportSnapshot) override;
void DidModifyTransceivers(
WebVector<std::unique_ptr<RTCRtpTransceiverPlatform>>,
WebVector<uintptr_t>,
bool is_remote_description) override;
void DidModifyTransceivers(Vector<std::unique_ptr<RTCRtpTransceiverPlatform>>,
Vector<uintptr_t>,
bool is_remote_description) override;
void DidAddRemoteDataChannel(
scoped_refptr<webrtc::DataChannelInterface> channel) override;
void DidNoteInterestingUsage(int usage_pattern) override;
......
......@@ -2311,15 +2311,15 @@ void RTCPeerConnectionHandler::OnModifyTransceivers(
std::vector<blink::RtpTransceiverState> transceiver_states,
bool is_remote_description) {
DCHECK_EQ(configuration_.sdp_semantics, webrtc::SdpSemantics::kUnifiedPlan);
std::vector<std::unique_ptr<RTCRtpTransceiverPlatform>> platform_transceivers(
transceiver_states.size());
Vector<std::unique_ptr<RTCRtpTransceiverPlatform>> platform_transceivers(
SafeCast<WTF::wtf_size_t>(transceiver_states.size()));
PeerConnectionTracker::TransceiverUpdatedReason update_reason =
!is_remote_description ? PeerConnectionTracker::TransceiverUpdatedReason::
kSetLocalDescription
: PeerConnectionTracker::TransceiverUpdatedReason::
kSetRemoteDescription;
blink::WebVector<uintptr_t> ids(transceiver_states.size());
for (size_t i = 0; i < transceiver_states.size(); ++i) {
for (WTF::wtf_size_t i = 0; i < transceiver_states.size(); ++i) {
// Figure out if this transceiver is new or if setting the state modified
// the transceiver such that it should be logged by the
// |peer_connection_tracker_|.
......@@ -2361,7 +2361,7 @@ void RTCPeerConnectionHandler::OnModifyTransceivers(
}
}
// Search for removed transceivers by comparing to previous state.
blink::WebVector<uintptr_t> removed_transceivers;
Vector<uintptr_t> removed_transceivers;
for (auto transceiver_id : previous_transceiver_ids_) {
if (std::find(ids.begin(), ids.end(), transceiver_id) == ids.end()) {
removed_transceivers.emplace_back(transceiver_id);
......
......@@ -34,9 +34,9 @@
#include <memory>
#include "base/memory/scoped_refptr.h"
#include "third_party/blink/public/platform/web_vector.h"
#include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
#include "third_party/blink/renderer/platform/wtf/vector.h"
#include "third_party/webrtc/api/peer_connection_interface.h"
#include "third_party/webrtc/api/sctp_transport_interface.h"
......@@ -76,8 +76,8 @@ class PLATFORM_EXPORT RTCPeerConnectionHandlerClient {
virtual void DidRemoveReceiverPlanB(
std::unique_ptr<RTCRtpReceiverPlatform>) = 0;
virtual void DidModifyTransceivers(
WebVector<std::unique_ptr<RTCRtpTransceiverPlatform>>,
WebVector<uintptr_t>,
Vector<std::unique_ptr<RTCRtpTransceiverPlatform>>,
Vector<uintptr_t>,
bool is_remote_description) = 0;
virtual void DidModifySctpTransport(WebRTCSctpTransportSnapshot) = 0;
virtual void DidAddRemoteDataChannel(
......
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