| Index: net/quic/core/quic_utils.cc
|
| diff --git a/net/quic/core/quic_utils.cc b/net/quic/core/quic_utils.cc
|
| index 16e2a1de0201b91e9d07f90ec8e87d7807408ab7..e75f32d5f340c53e9a0882ece15a80863299a0d4 100644
|
| --- a/net/quic/core/quic_utils.cc
|
| +++ b/net/quic/core/quic_utils.cc
|
| @@ -127,40 +127,18 @@ uint128 QuicUtils::FNV1a_128_Hash_Two(const char* data1,
|
| bool QuicUtils::FindMutualTag(const QuicTagVector& our_tags_vector,
|
| const QuicTag* their_tags,
|
| size_t num_their_tags,
|
| - Priority priority,
|
| QuicTag* out_result,
|
| size_t* out_index) {
|
| if (our_tags_vector.empty()) {
|
| return false;
|
| }
|
| const size_t num_our_tags = our_tags_vector.size();
|
| - const QuicTag* our_tags = &our_tags_vector[0];
|
| -
|
| - size_t num_priority_tags, num_inferior_tags;
|
| - const QuicTag* priority_tags;
|
| - const QuicTag* inferior_tags;
|
| - if (priority == LOCAL_PRIORITY) {
|
| - num_priority_tags = num_our_tags;
|
| - priority_tags = our_tags;
|
| - num_inferior_tags = num_their_tags;
|
| - inferior_tags = their_tags;
|
| - } else {
|
| - num_priority_tags = num_their_tags;
|
| - priority_tags = their_tags;
|
| - num_inferior_tags = num_our_tags;
|
| - inferior_tags = our_tags;
|
| - }
|
| -
|
| - for (size_t i = 0; i < num_priority_tags; i++) {
|
| - for (size_t j = 0; j < num_inferior_tags; j++) {
|
| - if (priority_tags[i] == inferior_tags[j]) {
|
| - *out_result = priority_tags[i];
|
| - if (out_index) {
|
| - if (priority == LOCAL_PRIORITY) {
|
| - *out_index = j;
|
| - } else {
|
| - *out_index = i;
|
| - }
|
| + for (size_t i = 0; i < num_our_tags; i++) {
|
| + for (size_t j = 0; j < num_their_tags; j++) {
|
| + if (our_tags_vector[i] == their_tags[j]) {
|
| + *out_result = our_tags_vector[i];
|
| + if (out_index != nullptr) {
|
| + *out_index = j;
|
| }
|
| return true;
|
| }
|
|
|