Chromium Code Reviews| Index: net/spdy/hpack_huffman_aggregator.cc |
| diff --git a/net/spdy/hpack_huffman_aggregator.cc b/net/spdy/hpack_huffman_aggregator.cc |
| index 41a3f48afc1d5a7ebbb97c633b0178b6998d756b..f0c5d83d65fddab5c38f93338e97d9e5be6e1cdf 100644 |
| --- a/net/spdy/hpack_huffman_aggregator.cc |
| +++ b/net/spdy/hpack_huffman_aggregator.cc |
| @@ -49,8 +49,9 @@ void HpackHuffmanAggregator::AggregateTransactionCharacterCounts( |
| if (IsCrossOrigin(request)) { |
| return; |
| } |
| - HostPortPair endpoint = HostPortPair(request.url.HostNoBrackets(), |
| - request.url.EffectiveIntPort()); |
| + HostPortPair endpoint = HostPortPair( |
| + request.url.HostNoBrackets(), |
| + static_cast<uint16>(request.url.EffectiveIntPort())); |
|
mmenke
2014/11/18 21:06:39
While you're here, this is just HostPortPair::From
Peter Kasting
2014/11/18 23:38:43
Done.
|
| HpackEncoder* encoder = ObtainEncoder( |
| SpdySessionKey(endpoint, proxy, request.privacy_mode)); |
| @@ -108,8 +109,9 @@ void HpackHuffmanAggregator::CreateSpdyHeadersFromHttpResponse( |
| bool HpackHuffmanAggregator::IsCrossOrigin(const HttpRequestInfo& request) { |
| // Require that the request is top-level, or that it shares |
| // an origin with its referer. |
| - HostPortPair endpoint = HostPortPair(request.url.HostNoBrackets(), |
| - request.url.EffectiveIntPort()); |
| + HostPortPair endpoint = HostPortPair( |
| + request.url.HostNoBrackets(), |
| + static_cast<uint16>(request.url.EffectiveIntPort())); |
|
mmenke
2014/11/18 21:06:39
HostPortPair::FromURL(request.url)
Peter Kasting
2014/11/18 23:38:43
Done.
|
| if ((request.load_flags & LOAD_MAIN_FRAME) == 0) { |
| std::string referer_str; |
| if (!request.extra_headers.GetHeader(HttpRequestHeaders::kReferer, |
| @@ -118,8 +120,9 @@ bool HpackHuffmanAggregator::IsCrossOrigin(const HttpRequestInfo& request) { |
| return true; |
| } |
| GURL referer(referer_str); |
| - HostPortPair referer_endpoint = HostPortPair(referer.HostNoBrackets(), |
| - referer.EffectiveIntPort()); |
| + HostPortPair referer_endpoint = HostPortPair( |
| + referer.HostNoBrackets(), |
| + static_cast<uint16>(referer.EffectiveIntPort())); |
|
mmenke
2014/11/18 21:06:39
HostPortPair::FromURL(request.url)
Peter Kasting
2014/11/18 23:38:43
Done.
|
| if (!endpoint.Equals(referer_endpoint)) { |
| // Cross-origin request. |
| return true; |