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

Unified Diff: net/spdy/spdy_framer.cc

Issue 2794063002: Add a SpdyFramer extension API implementation. (Closed)
Patch Set: Re: #12. Created 3 years, 8 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
« net/spdy/spdy_frame_builder.h ('K') | « net/spdy/spdy_framer.h ('k') | no next file » | 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 dc15a8b7a95ee6bd561f13d84ee9e62eb1fedbd2..2fce4153bfac9ee0609750142368b136c0c7cd1a 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -1814,7 +1814,7 @@ SpdySerializedFrame SpdyFramer::SerializeDataFrameHeaderWithPaddingLengthField(
builder.OverwriteLength(*this, num_padding_fields + data_ir.data_len() +
data_ir.padding_payload_len());
} else {
- builder.BeginNewFrame(*this, SpdyFrameType::DATA, flags,
+ builder.BeginNewFrame(*this, SerializeFrameType(SpdyFrameType::DATA), flags,
data_ir.stream_id(),
num_padding_fields + data_ir.data_len() +
data_ir.padding_payload_len());
@@ -1987,8 +1987,8 @@ SpdySerializedFrame SpdyFramer::SerializeHeaders(const SpdyHeadersIR& headers) {
builder.BeginNewFrame(*this, SpdyFrameType::HEADERS, flags,
headers.stream_id());
} else {
- builder.BeginNewFrame(*this, SpdyFrameType::HEADERS, flags,
- headers.stream_id(), length_field);
+ builder.BeginNewFrame(*this, SerializeFrameType(SpdyFrameType::HEADERS),
+ flags, headers.stream_id(), length_field);
}
DCHECK_EQ(GetHeadersMinimumSize(), builder.length());
@@ -2078,8 +2078,9 @@ SpdySerializedFrame SpdyFramer::SerializePushPromise(
push_promise.stream_id());
} else {
size_t length = std::min(size, kMaxControlFrameSize) - GetFrameHeaderSize();
- builder.BeginNewFrame(*this, SpdyFrameType::PUSH_PROMISE, flags,
- push_promise.stream_id(), length);
+ builder.BeginNewFrame(*this,
+ SerializeFrameType(SpdyFrameType::PUSH_PROMISE),
+ flags, push_promise.stream_id(), length);
}
int padding_payload_len = 0;
if (push_promise.padded()) {
@@ -2394,10 +2395,11 @@ bool SpdyFramer::SerializeDataFrameHeaderWithPaddingLengthField(
num_padding_fields + data_ir.data_len() +
data_ir.padding_payload_len());
} else {
- ok = ok && builder.BeginNewFrame(*this, SpdyFrameType::DATA, flags,
- data_ir.stream_id(),
- num_padding_fields + data_ir.data_len() +
- data_ir.padding_payload_len());
+ ok = ok &&
+ builder.BeginNewFrame(*this, SerializeFrameType(SpdyFrameType::DATA),
+ flags, data_ir.stream_id(),
+ num_padding_fields + data_ir.data_len() +
+ data_ir.padding_payload_len());
if (data_ir.padded()) {
ok = ok && builder.WriteUInt8(data_ir.padding_payload_len() & 0xff);
}
@@ -2501,8 +2503,9 @@ bool SpdyFramer::SerializeHeaders(const SpdyHeadersIR& headers,
ok = builder.BeginNewFrame(*this, SpdyFrameType::HEADERS, flags,
headers.stream_id());
} else {
- ok = ok && builder.BeginNewFrame(*this, SpdyFrameType::HEADERS, flags,
- headers.stream_id(), length_field);
+ ok = ok && builder.BeginNewFrame(*this,
+ SerializeFrameType(SpdyFrameType::HEADERS),
+ flags, headers.stream_id(), length_field);
}
DCHECK_EQ(GetHeadersMinimumSize(), builder.length());
@@ -2567,8 +2570,9 @@ bool SpdyFramer::SerializePushPromise(const SpdyPushPromiseIR& push_promise,
push_promise.stream_id());
} else {
size_t length = std::min(size, kMaxControlFrameSize) - GetFrameHeaderSize();
- ok = builder.BeginNewFrame(*this, SpdyFrameType::PUSH_PROMISE, flags,
- push_promise.stream_id(), length);
+ ok = builder.BeginNewFrame(*this,
+ SerializeFrameType(SpdyFrameType::PUSH_PROMISE),
+ flags, push_promise.stream_id(), length);
}
int padding_payload_len = 0;
@@ -2800,8 +2804,9 @@ bool SpdyFramer::WritePayloadWithContinuation(SpdyFrameBuilder* builder,
ret &= builder->BeginNewFrame(*this, SpdyFrameType::CONTINUATION, flags,
stream_id);
} else {
- ret &= builder->BeginNewFrame(*this, SpdyFrameType::CONTINUATION, flags,
- stream_id, bytes_to_write);
+ ret &= builder->BeginNewFrame(
+ *this, SerializeFrameType(SpdyFrameType::CONTINUATION), flags,
+ stream_id, bytes_to_write);
}
// Write payload fragment.
ret &= builder->WriteBytes(
« net/spdy/spdy_frame_builder.h ('K') | « net/spdy/spdy_framer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698