Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1305)

Unified Diff: net/spdy/spdy_session.cc

Issue 2018513002: Plumb unmodified HTTP/2 stream weight value through SPDY framing code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_session.h ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index daa1208452bcb328550cef5a7ea8ac7a7d76611a..519c83d272aefb8aa02ed8feaa2cec4889e6385d 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -81,7 +81,7 @@ std::unique_ptr<base::Value> NetLogSpdyHeadersSentCallback(
bool fin,
SpdyStreamId stream_id,
bool has_priority,
- uint32_t priority,
+ int weight,
SpdyStreamId parent_stream_id,
bool exclusive,
NetLogCaptureMode capture_mode) {
@@ -92,7 +92,7 @@ std::unique_ptr<base::Value> NetLogSpdyHeadersSentCallback(
dict->SetBoolean("has_priority", has_priority);
if (has_priority) {
dict->SetInteger("parent_stream_id", parent_stream_id);
- dict->SetInteger("priority", static_cast<int>(priority));
+ dict->SetInteger("weight", weight);
dict->SetBoolean("exclusive", exclusive);
}
return std::move(dict);
@@ -1123,7 +1123,7 @@ std::unique_ptr<SpdySerializedFrame> SpdySession::CreateSynStream(
}
} else {
SpdyHeadersIR headers(stream_id);
- headers.set_priority(spdy_priority);
+ headers.set_weight(Spdy3PriorityToHttp2Weight(spdy_priority));
headers.set_has_priority(true);
if (priority_dependencies_enabled_) {
@@ -1145,7 +1145,7 @@ std::unique_ptr<SpdySerializedFrame> SpdySession::CreateSynStream(
NetLog::TYPE_HTTP2_SESSION_SEND_HEADERS,
base::Bind(&NetLogSpdyHeadersSentCallback, &block,
(flags & CONTROL_FLAG_FIN) != 0, stream_id,
- headers.has_priority(), headers.priority(),
+ headers.has_priority(), headers.weight(),
headers.parent_stream_id(), headers.exclusive()));
}
}
@@ -2436,7 +2436,7 @@ void SpdySession::OnSynReply(SpdyStreamId stream_id,
void SpdySession::OnHeaders(SpdyStreamId stream_id,
bool has_priority,
- SpdyPriority priority,
+ int weight,
SpdyStreamId parent_stream_id,
bool exclusive,
bool fin,
« no previous file with comments | « net/spdy/spdy_session.h ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698