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

Unified Diff: net/http2/decoder/payload_decoders/push_promise_payload_decoder.cc

Issue 2554683003: Revert of Add new HTTP/2 and HPACK decoder in net/http2/. (Closed)
Patch Set: Created 4 years 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
Index: net/http2/decoder/payload_decoders/push_promise_payload_decoder.cc
diff --git a/net/http2/decoder/payload_decoders/push_promise_payload_decoder.cc b/net/http2/decoder/payload_decoders/push_promise_payload_decoder.cc
deleted file mode 100644
index f160d1eee2074853886655a405f32a3d5192a35b..0000000000000000000000000000000000000000
--- a/net/http2/decoder/payload_decoders/push_promise_payload_decoder.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/http2/decoder/payload_decoders/push_promise_payload_decoder.h"
-
-#include <stddef.h>
-
-#include "base/logging.h"
-#include "base/macros.h"
-#include "net/http2/decoder/decode_buffer.h"
-#include "net/http2/decoder/http2_frame_decoder_listener.h"
-#include "net/http2/http2_constants.h"
-#include "net/http2/http2_structures.h"
-#include "net/http2/tools/http2_bug_tracker.h"
-
-namespace net {
-
-std::ostream& operator<<(std::ostream& out,
- PushPromisePayloadDecoder::PayloadState v) {
- switch (v) {
- case PushPromisePayloadDecoder::PayloadState::kReadPadLength:
- return out << "kReadPadLength";
- case PushPromisePayloadDecoder::PayloadState::
- kStartDecodingPushPromiseFields:
- return out << "kStartDecodingPushPromiseFields";
- case PushPromisePayloadDecoder::PayloadState::kReadPayload:
- return out << "kReadPayload";
- case PushPromisePayloadDecoder::PayloadState::kSkipPadding:
- return out << "kSkipPadding";
- case PushPromisePayloadDecoder::PayloadState::
- kResumeDecodingPushPromiseFields:
- return out << "kResumeDecodingPushPromiseFields";
- }
- return out << static_cast<int>(v);
-}
-
-DecodeStatus PushPromisePayloadDecoder::StartDecodingPayload(
- FrameDecoderState* state,
- DecodeBuffer* db) {
- const Http2FrameHeader& frame_header = state->frame_header();
- const uint32_t total_length = frame_header.payload_length;
-
- DVLOG(2) << "PushPromisePayloadDecoder::StartDecodingPayload: "
- << frame_header;
-
- DCHECK_EQ(Http2FrameType::PUSH_PROMISE, frame_header.type);
- DCHECK_LE(db->Remaining(), total_length);
- DCHECK_EQ(
- 0, frame_header.flags &
- ~(Http2FrameFlag::FLAG_END_HEADERS | Http2FrameFlag::FLAG_PADDED));
-
- if (!frame_header.IsPadded()) {
- // If it turns out that PUSH_PROMISE frames without padding are sufficiently
- // common, and that they are usually short enough that they fit entirely
- // into one DecodeBuffer, we can detect that here and implement a special
- // case, avoiding the state machine in ResumeDecodingPayload.
- payload_state_ = PayloadState::kStartDecodingPushPromiseFields;
- } else {
- payload_state_ = PayloadState::kReadPadLength;
- }
- state->InitializeRemainders();
- return ResumeDecodingPayload(state, db);
-}
-
-DecodeStatus PushPromisePayloadDecoder::ResumeDecodingPayload(
- FrameDecoderState* state,
- DecodeBuffer* db) {
- DVLOG(2) << "UnknownPayloadDecoder::ResumeDecodingPayload"
- << " remaining_payload=" << state->remaining_payload()
- << " db->Remaining=" << db->Remaining();
-
- const Http2FrameHeader& frame_header = state->frame_header();
- DCHECK_EQ(Http2FrameType::PUSH_PROMISE, frame_header.type);
- DCHECK_LE(state->remaining_payload(), frame_header.payload_length);
- DCHECK_LE(db->Remaining(), frame_header.payload_length);
-
- DecodeStatus status;
- while (true) {
- DVLOG(2)
- << "PushPromisePayloadDecoder::ResumeDecodingPayload payload_state_="
- << payload_state_;
- switch (payload_state_) {
- case PayloadState::kReadPadLength:
- DCHECK_EQ(state->remaining_payload(), frame_header.payload_length);
- // ReadPadLength handles the OnPadLength callback, and updating the
- // remaining_payload and remaining_padding fields. If the amount of
- // padding is too large to fit in the frame's payload, ReadPadLength
- // instead calls OnPaddingTooLong and returns kDecodeError.
- // Suppress the call to OnPadLength because we haven't yet called
- // OnPushPromiseStart, which needs to wait until we've decoded the
- // Promised Stream ID.
- status = state->ReadPadLength(db, /*report_pad_length*/ false);
- if (status != DecodeStatus::kDecodeDone) {
- payload_state_ = PayloadState::kReadPadLength;
- return status;
- }
- // FALLTHROUGH_INTENDED
-
- case PayloadState::kStartDecodingPushPromiseFields:
- status =
- state->StartDecodingStructureInPayload(&push_promise_fields_, db);
- if (status != DecodeStatus::kDecodeDone) {
- payload_state_ = PayloadState::kResumeDecodingPushPromiseFields;
- return status;
- }
- // Finished decoding the Promised Stream ID. Can now tell the listener
- // that we're starting to decode a PUSH_PROMISE frame.
- ReportPushPromise(state);
- // FALLTHROUGH_INTENDED
-
- case PayloadState::kReadPayload:
- DCHECK_LT(state->remaining_payload(), frame_header.payload_length);
- DCHECK_LE(state->remaining_payload(),
- frame_header.payload_length -
- Http2PushPromiseFields::EncodedSize());
- DCHECK_LE(
- state->remaining_payload(),
- frame_header.payload_length -
- Http2PushPromiseFields::EncodedSize() -
- (frame_header.IsPadded() ? (1 + state->remaining_padding())
- : 0));
- {
- size_t avail = state->AvailablePayload(db);
- state->listener()->OnHpackFragment(db->cursor(), avail);
- db->AdvanceCursor(avail);
- state->ConsumePayload(avail);
- }
- if (state->remaining_payload() > 0) {
- payload_state_ = PayloadState::kReadPayload;
- return DecodeStatus::kDecodeInProgress;
- }
- // FALLTHROUGH_INTENDED
-
- case PayloadState::kSkipPadding:
- // SkipPadding handles the OnPadding callback.
- if (state->SkipPadding(db)) {
- state->listener()->OnPushPromiseEnd();
- return DecodeStatus::kDecodeDone;
- }
- payload_state_ = PayloadState::kSkipPadding;
- return DecodeStatus::kDecodeInProgress;
-
- case PayloadState::kResumeDecodingPushPromiseFields:
- status =
- state->ResumeDecodingStructureInPayload(&push_promise_fields_, db);
- if (status == DecodeStatus::kDecodeDone) {
- // Finished decoding the Promised Stream ID. Can now tell the listener
- // that we're starting to decode a PUSH_PROMISE frame.
- ReportPushPromise(state);
- payload_state_ = PayloadState::kReadPayload;
- continue;
- }
- payload_state_ = PayloadState::kResumeDecodingPushPromiseFields;
- return status;
- }
- HTTP2_BUG << "PayloadState: " << payload_state_;
- }
-}
-
-void PushPromisePayloadDecoder::ReportPushPromise(FrameDecoderState* state) {
- const Http2FrameHeader& frame_header = state->frame_header();
- if (frame_header.IsPadded()) {
- state->listener()->OnPushPromiseStart(frame_header, push_promise_fields_,
- 1 + state->remaining_padding());
- } else {
- state->listener()->OnPushPromiseStart(frame_header, push_promise_fields_,
- 0);
- }
-}
-
-} // namespace net

Powered by Google App Engine
This is Rietveld 408576698