Only MarkTrailersConsumed when actually sending trailers notification

net/quic/quic_chromium_client_stream.cc

 // Copyright (c) 2012 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/quic/quic_chromium_client_stream.h"
 
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/io_buffer.h"
@@ skipping 17 matching lines @@
       weak_factory_(this) {}
 
 QuicChromiumClientStream::~QuicChromiumClientStream() {
   if (delegate_)
     delegate_->OnClose(connection_error());
 }
 
 void QuicChromiumClientStream::OnStreamHeadersComplete(bool fin,
                                                        size_t frame_len) {
   QuicSpdyStream::OnStreamHeadersComplete(fin, frame_len);
-  SpdyHeaderBlock headers;
-  SpdyFramer framer(HTTP2);
-
-  size_t headers_len;
-  const char* header_data;
   if (decompressed_headers().empty() && !decompressed_trailers().empty()) {
     DCHECK(trailers_decompressed());
-    headers_len = decompressed_trailers().length();
-    header_data = decompressed_trailers().data();
+    // The delegate will read the trailers via a posted task.
+    NotifyDelegateOfHeadersCompleteLater(response_trailers(), frame_len);
   } else {
     DCHECK(!headers_delivered_);
-    headers_len = decompressed_headers().length();
-    header_data = decompressed_headers().data();
-  }
-  if (!framer.ParseHeaderBlockInBuffer(header_data, headers_len, &headers)) {
-    DLOG(WARNING) << "Invalid headers";
-    Reset(QUIC_BAD_APPLICATION_PAYLOAD);
-    return;
-  }
-
-  if (!headers_delivered_) {
+    SpdyHeaderBlock headers;
+    SpdyFramer framer(HTTP2);
+    size_t headers_len = decompressed_headers().length();
+    const char* header_data = decompressed_headers().data();
+    if (!framer.ParseHeaderBlockInBuffer(header_data, headers_len, &headers)) {
+      DLOG(WARNING) << "Invalid headers";
+      Reset(QUIC_BAD_APPLICATION_PAYLOAD);
+      return;
+    }
     MarkHeadersConsumed(headers_len);
     session_->OnInitialHeadersComplete(id(), headers);
-  } else {
-    MarkTrailersConsumed(headers_len);
+
+    // The delegate will read the headers via a posted task.
+    NotifyDelegateOfHeadersCompleteLater(headers, frame_len);
   }
-
-  // The delegate will read the headers via a posted task.
-  NotifyDelegateOfHeadersCompleteLater(headers, frame_len);
 }
 
 void QuicChromiumClientStream::OnPromiseHeadersComplete(
     QuicStreamId promised_id,
     size_t frame_len) {
   size_t headers_len = decompressed_headers().length();
   SpdyHeaderBlock headers;
   SpdyFramer framer(HTTP2);
   if (!framer.ParseHeaderBlockInBuffer(decompressed_headers().data(),
                                        headers_len, &headers)) {
@@ skipping 109 matching lines @@
   RunOrBuffer(
       base::Bind(&QuicChromiumClientStream::NotifyDelegateOfHeadersComplete,
                  weak_factory_.GetWeakPtr(), headers, frame_len));
 }
 
 void QuicChromiumClientStream::NotifyDelegateOfHeadersComplete(
     SpdyHeaderBlock headers,
     size_t frame_len) {
   if (!delegate_)
     return;
+  // Only mark trailers consumed when we are about to notify delegate.
+  if (headers_delivered_)
+    MarkTrailersConsumed(decompressed_trailers().length());
 
   headers_delivered_ = true;
   delegate_->OnHeadersAvailable(headers, frame_len);
 }
 
 void QuicChromiumClientStream::NotifyDelegateOfDataAvailableLater() {
   RunOrBuffer(
       base::Bind(&QuicChromiumClientStream::NotifyDelegateOfDataAvailable,
                  weak_factory_.GetWeakPtr()));
 }
 
 void QuicChromiumClientStream::NotifyDelegateOfDataAvailable() {
   if (delegate_)
     delegate_->OnDataAvailable();
 }
 
 void QuicChromiumClientStream::RunOrBuffer(base::Closure closure) {
   if (delegate_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, closure);
   } else {
     delegate_tasks_.push_back(closure);
   }
 }
 
 }  // namespace net