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

Unified Diff: net/spdy/spdy_framer.cc

Issue 263033007: SPDY: Remove redundant end_push_promise and end_headers fields. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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_frame_builder_test.cc ('k') | net/spdy/spdy_framer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_framer.cc
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index a20d1ead1f83b1c433bddd0ce9ffe2b2a29db05b..3d9994013171b787a6bccba0d1e64144b62baecb 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -2407,12 +2407,8 @@ SpdySerializedFrame* SpdyFramer::SerializeHeaders(
flags |= CONTROL_FLAG_FIN;
}
if (protocol_version() > SPDY3) {
- // TODO(mlavan): If we overflow into a CONTINUATION frame, this will
- // get overwritten below, so we should probably just get rid of the
- // end_headers field.
- if (headers.end_headers()) {
- flags |= HEADERS_FLAG_END_HEADERS;
- }
+ // This will get overwritten if we overflow into a CONTINUATION frame.
+ flags |= HEADERS_FLAG_END_HEADERS;
if (headers.has_priority()) {
flags |= HEADERS_FLAG_PRIORITY;
}
@@ -2518,12 +2514,8 @@ SpdyFrame* SpdyFramer::SerializePushPromise(
const SpdyPushPromiseIR& push_promise) {
DCHECK_LT(SPDY3, protocol_version());
uint8 flags = 0;
- // TODO(mlavan): If we overflow into a CONTINUATION frame, this will
- // get overwritten below, so we should probably just get rid of the
- // end_push_promise field.
- if (push_promise.end_push_promise()) {
- flags |= PUSH_PROMISE_FLAG_END_PUSH_PROMISE;
- }
+ // This will get overwritten if we overflow into a CONTINUATION frame.
+ flags |= PUSH_PROMISE_FLAG_END_PUSH_PROMISE;
// The size of this frame, including variable-length name-value block.
size_t size = GetPushPromiseMinimumSize();
« no previous file with comments | « net/spdy/spdy_frame_builder_test.cc ('k') | net/spdy/spdy_framer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698