summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/quic/quic_http_stream.cc7
-rw-r--r--net/spdy/buffered_spdy_framer.cc2
-rw-r--r--net/spdy/buffered_spdy_framer.h2
-rw-r--r--net/spdy/spdy_http_utils.cc29
-rw-r--r--net/spdy/spdy_http_utils.h10
-rw-r--r--net/spdy/spdy_http_utils_unittest.cc42
-rw-r--r--net/spdy/spdy_session.cc2
-rw-r--r--net/spdy/spdy_session.h2
-rw-r--r--net/spdy/spdy_stream.cc2
-rw-r--r--net/spdy/spdy_stream.h2
-rw-r--r--net/spdy/spdy_websocket_test_util.cc4
11 files changed, 52 insertions, 52 deletions
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index d1d3549..214d259 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -99,9 +99,8 @@ int QuicHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
QuicPriority priority = ConvertRequestPriorityToQuicPriority(priority_);
stream_->set_priority(priority);
// Store the serialized request headers.
- CreateSpdyHeadersFromHttpRequest(
- *request_info_, request_headers, &request_headers_,
- /*version=*/3, /*direct=*/true);
+ CreateSpdyHeadersFromHttpRequest(*request_info_, request_headers,
+ &request_headers_, SPDY3, /*direct=*/true);
// Store the request body.
request_body_stream_ = request_info_->upload_data_stream;
@@ -522,7 +521,7 @@ int QuicHttpStream::ParseResponseHeaders() {
NetLog::TYPE_QUIC_HTTP_STREAM_READ_RESPONSE_HEADERS,
base::Bind(&SpdyHeaderBlockNetLogCallback, &headers));
- if (!SpdyHeadersToHttpResponse(headers, 3, response_info_)) {
+ if (!SpdyHeadersToHttpResponse(headers, SPDY3, response_info_)) {
DLOG(WARNING) << "Invalid headers";
return ERR_QUIC_PROTOCOL_ERROR;
}
diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc
index 049c3da..1535f9f 100644
--- a/net/spdy/buffered_spdy_framer.cc
+++ b/net/spdy/buffered_spdy_framer.cc
@@ -217,7 +217,7 @@ void BufferedSpdyFramer::OnPushPromise(SpdyStreamId stream_id,
visitor_->OnPushPromise(stream_id, promised_stream_id);
}
-int BufferedSpdyFramer::protocol_version() {
+SpdyMajorVersion BufferedSpdyFramer::protocol_version() {
return spdy_framer_.protocol_version();
}
diff --git a/net/spdy/buffered_spdy_framer.h b/net/spdy/buffered_spdy_framer.h
index 85ad537..fdd026b 100644
--- a/net/spdy/buffered_spdy_framer.h
+++ b/net/spdy/buffered_spdy_framer.h
@@ -154,7 +154,7 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer
// SpdyFramer methods.
size_t ProcessInput(const char* data, size_t len);
- int protocol_version();
+ SpdyMajorVersion protocol_version();
void Reset();
SpdyFramer::SpdyError error_code() const;
SpdyFramer::SpdyState state() const;
diff --git a/net/spdy/spdy_http_utils.cc b/net/spdy/spdy_http_utils.cc
index 37daeb4..da95b51 100644
--- a/net/spdy/spdy_http_utils.cc
+++ b/net/spdy/spdy_http_utils.cc
@@ -21,10 +21,11 @@
namespace net {
bool SpdyHeadersToHttpResponse(const SpdyHeaderBlock& headers,
- int protocol_version,
+ SpdyMajorVersion protocol_version,
HttpResponseInfo* response) {
- std::string status_key = (protocol_version >= 3) ? ":status" : "status";
- std::string version_key = (protocol_version >= 3) ? ":version" : "version";
+ std::string status_key = (protocol_version >= SPDY3) ? ":status" : "status";
+ std::string version_key =
+ (protocol_version >= SPDY3) ? ":version" : "version";
std::string version;
std::string status;
@@ -82,7 +83,7 @@ bool SpdyHeadersToHttpResponse(const SpdyHeaderBlock& headers,
void CreateSpdyHeadersFromHttpRequest(const HttpRequestInfo& info,
const HttpRequestHeaders& request_headers,
SpdyHeaderBlock* headers,
- int protocol_version,
+ SpdyMajorVersion protocol_version,
bool direct) {
HttpRequestHeaders::Iterator it(request_headers);
@@ -103,7 +104,7 @@ void CreateSpdyHeadersFromHttpRequest(const HttpRequestInfo& info,
}
static const char kHttpProtocolVersion[] = "HTTP/1.1";
- if (protocol_version < 3) {
+ if (protocol_version < SPDY3) {
(*headers)["version"] = kHttpProtocolVersion;
(*headers)["method"] = info.method;
(*headers)["host"] = GetHostAndOptionalPort(info.url);
@@ -129,10 +130,10 @@ COMPILE_ASSERT(HIGHEST - LOWEST < 4 &&
SpdyPriority ConvertRequestPriorityToSpdyPriority(
const RequestPriority priority,
- int protocol_version) {
+ SpdyMajorVersion protocol_version) {
DCHECK_GE(priority, MINIMUM_PRIORITY);
DCHECK_LE(priority, MAXIMUM_PRIORITY);
- if (protocol_version == 2) {
+ if (protocol_version == SPDY2) {
// SPDY 2 only has 2 bits of priority, but we have 5 RequestPriorities.
// Map IDLE => 3, LOWEST => 2, LOW => 2, MEDIUM => 1, HIGHEST => 0.
if (priority > LOWEST) {
@@ -147,19 +148,19 @@ SpdyPriority ConvertRequestPriorityToSpdyPriority(
NET_EXPORT_PRIVATE RequestPriority ConvertSpdyPriorityToRequestPriority(
SpdyPriority priority,
- int protocol_version) {
+ SpdyMajorVersion protocol_version) {
// Handle invalid values gracefully, and pick LOW to map 2 back
// to for SPDY/2.
- SpdyPriority idle_cutoff = (protocol_version == 2) ? 3 : 5;
+ SpdyPriority idle_cutoff = (protocol_version == SPDY2) ? 3 : 5;
return (priority >= idle_cutoff) ?
IDLE : static_cast<RequestPriority>(HIGHEST - priority);
}
GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
- int protocol_version,
+ SpdyMajorVersion protocol_version,
bool pushed) {
// SPDY 2 server push urls are specified in a single "url" header.
- if (pushed && protocol_version == 2) {
+ if (pushed && protocol_version == SPDY2) {
std::string url;
SpdyHeaderBlock::const_iterator it;
it = headers.find("url");
@@ -168,9 +169,9 @@ GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
return GURL(url);
}
- const char* scheme_header = protocol_version >= 3 ? ":scheme" : "scheme";
- const char* host_header = protocol_version >= 3 ? ":host" : "host";
- const char* path_header = protocol_version >= 3 ? ":path" : "url";
+ const char* scheme_header = protocol_version >= SPDY3 ? ":scheme" : "scheme";
+ const char* host_header = protocol_version >= SPDY3 ? ":host" : "host";
+ const char* path_header = protocol_version >= SPDY3 ? ":path" : "url";
std::string scheme;
std::string host_port;
diff --git a/net/spdy/spdy_http_utils.h b/net/spdy/spdy_http_utils.h
index 26511a7..6a91c888 100644
--- a/net/spdy/spdy_http_utils.h
+++ b/net/spdy/spdy_http_utils.h
@@ -24,7 +24,7 @@ class HttpRequestHeaders;
// Returns true if successfully converted. False if the SpdyHeaderBlock is
// incomplete (e.g. missing 'status' or 'version').
bool SpdyHeadersToHttpResponse(const SpdyHeaderBlock& headers,
- int protocol_version,
+ SpdyMajorVersion protocol_version,
HttpResponseInfo* response);
// Create a SpdyHeaderBlock for a Spdy SYN_STREAM Frame from
@@ -33,13 +33,13 @@ void NET_EXPORT_PRIVATE CreateSpdyHeadersFromHttpRequest(
const HttpRequestInfo& info,
const HttpRequestHeaders& request_headers,
SpdyHeaderBlock* headers,
- int protocol_version,
+ SpdyMajorVersion protocol_version,
bool direct);
// Returns the URL associated with the |headers| by assembling the
// scheme, host and path from the protocol specific keys.
GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
- int protocol_version,
+ SpdyMajorVersion protocol_version,
bool pushed);
// Returns true if the value of this header should be displayed.
@@ -48,11 +48,11 @@ NET_EXPORT_PRIVATE bool ShouldShowHttpHeaderValue(
NET_EXPORT_PRIVATE SpdyPriority ConvertRequestPriorityToSpdyPriority(
RequestPriority priority,
- int protocol_version);
+ SpdyMajorVersion protocol_version);
NET_EXPORT_PRIVATE RequestPriority ConvertSpdyPriorityToRequestPriority(
SpdyPriority priority,
- int protocol_version);
+ SpdyMajorVersion protocol_version);
} // namespace net
diff --git a/net/spdy/spdy_http_utils_unittest.cc b/net/spdy/spdy_http_utils_unittest.cc
index b198808..daac323 100644
--- a/net/spdy/spdy_http_utils_unittest.cc
+++ b/net/spdy/spdy_http_utils_unittest.cc
@@ -12,43 +12,43 @@ namespace net {
namespace {
TEST(SpdyHttpUtilsTest, ConvertRequestPriorityToSpdy2Priority) {
- EXPECT_EQ(0, ConvertRequestPriorityToSpdyPriority(HIGHEST, 2));
- EXPECT_EQ(1, ConvertRequestPriorityToSpdyPriority(MEDIUM, 2));
- EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOW, 2));
- EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOWEST, 2));
- EXPECT_EQ(3, ConvertRequestPriorityToSpdyPriority(IDLE, 2));
+ EXPECT_EQ(0, ConvertRequestPriorityToSpdyPriority(HIGHEST, SPDY2));
+ EXPECT_EQ(1, ConvertRequestPriorityToSpdyPriority(MEDIUM, SPDY2));
+ EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOW, SPDY2));
+ EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOWEST, SPDY2));
+ EXPECT_EQ(3, ConvertRequestPriorityToSpdyPriority(IDLE, SPDY2));
}
TEST(SpdyHttpUtilsTest, ConvertRequestPriorityToSpdy3Priority) {
- EXPECT_EQ(0, ConvertRequestPriorityToSpdyPriority(HIGHEST, 3));
- EXPECT_EQ(1, ConvertRequestPriorityToSpdyPriority(MEDIUM, 3));
- EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOW, 3));
- EXPECT_EQ(3, ConvertRequestPriorityToSpdyPriority(LOWEST, 3));
- EXPECT_EQ(4, ConvertRequestPriorityToSpdyPriority(IDLE, 3));
+ EXPECT_EQ(0, ConvertRequestPriorityToSpdyPriority(HIGHEST, SPDY3));
+ EXPECT_EQ(1, ConvertRequestPriorityToSpdyPriority(MEDIUM, SPDY3));
+ EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOW, SPDY3));
+ EXPECT_EQ(3, ConvertRequestPriorityToSpdyPriority(LOWEST, SPDY3));
+ EXPECT_EQ(4, ConvertRequestPriorityToSpdyPriority(IDLE, SPDY3));
}
TEST(SpdyHttpUtilsTest, ConvertSpdy2PriorityToRequestPriority) {
- EXPECT_EQ(HIGHEST, ConvertSpdyPriorityToRequestPriority(0, 2));
- EXPECT_EQ(MEDIUM, ConvertSpdyPriorityToRequestPriority(1, 2));
- EXPECT_EQ(LOW, ConvertSpdyPriorityToRequestPriority(2, 2));
- EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(3, 2));
+ EXPECT_EQ(HIGHEST, ConvertSpdyPriorityToRequestPriority(0, SPDY2));
+ EXPECT_EQ(MEDIUM, ConvertSpdyPriorityToRequestPriority(1, SPDY2));
+ EXPECT_EQ(LOW, ConvertSpdyPriorityToRequestPriority(2, SPDY2));
+ EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(3, SPDY2));
// These are invalid values, but we should still handle them
// gracefully.
for (int i = 4; i < kuint8max; ++i) {
- EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i, 2));
+ EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i, SPDY2));
}
}
TEST(SpdyHttpUtilsTest, ConvertSpdy3PriorityToRequestPriority) {
- EXPECT_EQ(HIGHEST, ConvertSpdyPriorityToRequestPriority(0, 3));
- EXPECT_EQ(MEDIUM, ConvertSpdyPriorityToRequestPriority(1, 3));
- EXPECT_EQ(LOW, ConvertSpdyPriorityToRequestPriority(2, 3));
- EXPECT_EQ(LOWEST, ConvertSpdyPriorityToRequestPriority(3, 3));
- EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(4, 3));
+ EXPECT_EQ(HIGHEST, ConvertSpdyPriorityToRequestPriority(0, SPDY3));
+ EXPECT_EQ(MEDIUM, ConvertSpdyPriorityToRequestPriority(1, SPDY3));
+ EXPECT_EQ(LOW, ConvertSpdyPriorityToRequestPriority(2, SPDY3));
+ EXPECT_EQ(LOWEST, ConvertSpdyPriorityToRequestPriority(3, SPDY3));
+ EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(4, SPDY3));
// These are invalid values, but we should still handle them
// gracefully.
for (int i = 5; i < kuint8max; ++i) {
- EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i, 3));
+ EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i, SPDY3));
}
}
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index d81c538..e7f30fc 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -760,7 +760,7 @@ void SpdySession::AddPooledAlias(const SpdySessionKey& alias_key) {
pooled_aliases_.insert(alias_key);
}
-int SpdySession::GetProtocolVersion() const {
+SpdyMajorVersion SpdySession::GetProtocolVersion() const {
DCHECK(buffered_spdy_framer_.get());
return buffered_spdy_framer_->protocol_version();
}
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index e81ab26..8c8f72d 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -433,7 +433,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
return pooled_aliases_;
}
- int GetProtocolVersion() const;
+ SpdyMajorVersion GetProtocolVersion() const;
size_t GetDataFrameMinimumSize() const {
return buffered_spdy_framer_->GetDataFrameMinimumSize();
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 0a1f0e9..cf8b09d 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -520,7 +520,7 @@ void SpdyStream::OnFrameWriteComplete(SpdyFrameType frame_type,
DoLoop(OK);
}
-int SpdyStream::GetProtocolVersion() const {
+SpdyMajorVersion SpdyStream::GetProtocolVersion() const {
return session_->GetProtocolVersion();
}
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index 02be61e..cef6436 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -404,7 +404,7 @@ class NET_EXPORT_PRIVATE SpdyStream {
// TODO(akalin): Remove this, as it's only used in tests.
bool HasUrlFromHeaders() const;
- int GetProtocolVersion() const;
+ SpdyMajorVersion GetProtocolVersion() const;
private:
class SynStreamBufferProducer;
diff --git a/net/spdy/spdy_websocket_test_util.cc b/net/spdy/spdy_websocket_test_util.cc
index 4c3f7df..0e09453 100644
--- a/net/spdy/spdy_websocket_test_util.cc
+++ b/net/spdy/spdy_websocket_test_util.cc
@@ -72,7 +72,7 @@ SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHandshakeRequestFrame(
SYN_STREAM,
stream_id,
kDefaultAssociatedStreamId,
- ConvertRequestPriorityToSpdyPriority(request_priority, 2),
+ ConvertRequestPriorityToSpdyPriority(request_priority, SPDY2),
kSpdyCredentialSlotUnused,
CONTROL_FLAG_NONE,
kDefaultCompressed,
@@ -97,7 +97,7 @@ SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHandshakeResponseFrame(
SYN_REPLY,
stream_id,
kDefaultAssociatedStreamId,
- ConvertRequestPriorityToSpdyPriority(request_priority, 2),
+ ConvertRequestPriorityToSpdyPriority(request_priority, SPDY2),
kSpdyCredentialSlotUnused,
CONTROL_FLAG_NONE,
kDefaultCompressed,
generated by cgit v1.1 at 2025-03-28 03:39:52 +0000