wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 875f6e0be7b1 (bug 906990)

Browse Source
This commit is contained in:
Wes Kocher 2013-11-01 17:15:03 -07:00
parent 39d8f615ff
commit f82fa4a788
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
media/mtransport/nricemediastream.cpp
View File

@ -291,7 +291,6 @@ nsresult NrIceMediaStream::GetCandidatePairs(std::vector<NrIceCandidatePair>*
pair.nominated = p1->peer_nominated || p1->nominated;
pair.selected = p1->local->component &&
p1->local->component->active == p1;
pair.codeword = p1->codeword;
if (!ToNrIceCandidate(*(p1->local), &pair.local) ||
!ToNrIceCandidate(*(p1->remote), &pair.remote)) {

1
media/mtransport/nricemediastream.h
View File

@ -104,7 +104,6 @@ struct NrIceCandidatePair {
NrIceCandidate local;
NrIceCandidate remote;
// TODO(bcampen@mozilla.com): Is it important to put the foundation in here?
std::string codeword;
};
// Abstract base class for opaque values.

26
media/mtransport/test/ice_unittest.cpp
View File

@ -107,9 +107,6 @@ class IceCandidatePairCompare {
const NrIceCandidatePair& rhs) const {
if (lhs.priority == rhs.priority) {
if (lhs.local == rhs.local) {
if (lhs.remote == rhs.remote) {
return lhs.codeword < rhs.codeword;
}
return lhs.remote < rhs.remote;
}
return lhs.local < rhs.local;
@ -484,8 +481,7 @@ class IceTestPeer : public sigslot::has_slots<> {
std::cerr << "state = " << pair.state
<< " priority = " << pair.priority
<< " nominated = " << pair.nominated
<< " selected = " << pair.selected
<< " codeword = " << pair.codeword << std::endl;
<< " selected = " << pair.selected << std::endl;
}
void DumpCandidatePairs(NrIceMediaStream *stream) {
@ -1253,22 +1249,12 @@ TEST_F(IceConnectTest, TestRLogRingBuffer) {
ASSERT_TRUE(ContainsSucceededPair(pairs1));
ASSERT_TRUE(ContainsSucceededPair(pairs2));
for (auto p = pairs1.begin(); p != pairs1.end(); ++p) {
std::deque<std::string> logs;
std::string substring("CAND-PAIR(");
substring += p->codeword;
RLogRingBuffer::GetInstance()->Filter(substring, 0, &logs);
ASSERT_NE(0U, logs.size());
std::deque<std::string> logs;
RLogRingBuffer::GetInstance()->Filter("CAND-PAIR", 0, &logs);
std::cerr << "Dumping CAND-PAIR logging:" << std::endl;
for (auto i = logs.rbegin(); i != logs.rend(); ++i) {
std::cerr << *i << std::endl;
}
for (auto p = pairs2.begin(); p != pairs2.end(); ++p) {
std::deque<std::string> logs;
std::string substring("CAND-PAIR(");
substring += p->codeword;
RLogRingBuffer::GetInstance()->Filter(substring, 0, &logs);
ASSERT_NE(0U, logs.size());
}
RLogRingBuffer::DestroyInstance();
}