Move some SpdyHeaderBlock instances from heap to stack.

net/spdy/spdy_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/spdy/spdy_stream.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 82 matching lines @@
       stream_id_(0),
       url_(url),
       priority_(priority),
       send_stalled_by_flow_control_(false),
       send_window_size_(initial_send_window_size),
       max_recv_window_size_(max_recv_window_size),
       recv_window_size_(max_recv_window_size),
       unacked_recv_window_bytes_(0),
       session_(session),
       delegate_(NULL),
+      request_headers_valid_(false),
       pending_send_status_(MORE_DATA_TO_SEND),
       request_time_(base::Time::Now()),
       response_headers_status_(RESPONSE_HEADERS_ARE_INCOMPLETE),
       io_state_(STATE_IDLE),
       response_status_(OK),
       net_log_(net_log),
       raw_received_bytes_(0),
       raw_sent_bytes_(0),
       send_bytes_(0),
       recv_bytes_(0),
@@ skipping 81 matching lines @@
       session_->CloseActiveStream(stream_id_, OK);
       DCHECK(!weak_this);
       // |pending_recv_data_| is invalid at this point.
       break;
     }
   }
 }
 
 std::unique_ptr<SpdySerializedFrame> SpdyStream::ProduceSynStreamFrame() {
   CHECK_EQ(io_state_, STATE_IDLE);
-  CHECK(request_headers_);
+  CHECK(request_headers_valid_);
   CHECK_GT(stream_id_, 0u);
 
   SpdyControlFlags flags =
       (pending_send_status_ == NO_MORE_DATA_TO_SEND) ?
       CONTROL_FLAG_FIN : CONTROL_FLAG_NONE;
   std::unique_ptr<SpdySerializedFrame> frame(session_->CreateSynStream(
-      stream_id_, priority_, flags, request_headers_->Clone()));
+      stream_id_, priority_, flags, request_headers_.Clone()));
   send_time_ = base::TimeTicks::Now();
   return frame;
 }
 
 void SpdyStream::DetachDelegate() {
   DCHECK(!IsClosed());
   delegate_ = NULL;
   Cancel();
 }
 
@@ skipping 235 matching lines @@
       response_headers_status_ == RESPONSE_HEADERS_ARE_COMPLETE) {
     session_->ResetStream(
         stream_id_, RST_STREAM_PROTOCOL_ERROR,
         "Additional headers received for push stream");
     return ERR_SPDY_PROTOCOL_ERROR;
   }
   return MergeWithResponseHeaders(additional_response_headers);
 }
 
 void SpdyStream::OnPushPromiseHeadersReceived(const SpdyHeaderBlock& headers) {
-  CHECK(!request_headers_.get());
+  CHECK(!request_headers_valid_);
   CHECK_EQ(io_state_, STATE_IDLE);
   CHECK_EQ(type_, SPDY_PUSH_STREAM);
   DCHECK(!delegate_);
 
   io_state_ = STATE_RESERVED_REMOTE;
-  request_headers_.reset(new SpdyHeaderBlock(headers.Clone()));
+  request_headers_ = headers.Clone();
+  request_headers_valid_ = true;
 }
 
 void SpdyStream::OnDataReceived(std::unique_ptr<SpdyBuffer> buffer) {
   DCHECK(session_->IsStreamActive(stream_id_));
 
   // Track our bandwidth.
   recv_bytes_ += buffer ? buffer->GetRemainingSize() : 0;
   recv_last_byte_time_ = base::TimeTicks::Now();
 
   // If we're still buffering data for a push stream, we will do the
@@ skipping 189 matching lines @@
   } else {
     session_->CloseCreatedStream(GetWeakPtr(), OK);
   }
   // |this| is invalid at this point.
 }
 
 base::WeakPtr<SpdyStream> SpdyStream::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
-int SpdyStream::SendRequestHeaders(
-    std::unique_ptr<SpdyHeaderBlock> request_headers,
-    SpdySendStatus send_status) {
+int SpdyStream::SendRequestHeaders(SpdyHeaderBlock request_headers,
+                                   SpdySendStatus send_status) {
   CHECK_NE(type_, SPDY_PUSH_STREAM);
   CHECK_EQ(pending_send_status_, MORE_DATA_TO_SEND);
-  CHECK(!request_headers_);
+  CHECK(!request_headers_valid_);
   CHECK(!pending_send_data_.get());
   CHECK_EQ(io_state_, STATE_IDLE);
   request_headers_ = std::move(request_headers);
+  request_headers_valid_ = true;
   pending_send_status_ = send_status;
   session_->EnqueueStreamWrite(GetWeakPtr(), SYN_STREAM,
                                std::unique_ptr<SpdyBufferProducer>(
                                    new SynStreamBufferProducer(GetWeakPtr())));
   return ERR_IO_PENDING;
 }
 
 void SpdyStream::SendData(IOBuffer* data,
                           int length,
                           SpdySendStatus send_status) {
@@ skipping 65 matching lines @@
     load_timing_info->push_start = recv_first_byte_time_;
     bool done_receiving = IsClosed() || (!pending_recv_data_.empty() &&
                                          !pending_recv_data_.back());
     if (done_receiving)
       load_timing_info->push_end = recv_last_byte_time_;
   }
   return result;
 }
 
 GURL SpdyStream::GetUrlFromHeaders() const {
-  if (!request_headers_)
+  if (!request_headers_valid_)
     return GURL();
 
-  return GetUrlFromHeaderBlock(*request_headers_);
+  return GetUrlFromHeaderBlock(request_headers_);
 }
 
 bool SpdyStream::HasUrlFromHeaders() const {
   return !GetUrlFromHeaders().is_empty();
 }
 
 void SpdyStream::UpdateHistograms() {
   // We need at least the receive timers to be filled in, as otherwise
   // metrics can be bogus.
   if (recv_first_byte_time_.is_null() || recv_last_byte_time_.is_null())
@@ skipping 146 matching lines @@
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
 }  // namespace net