Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/quic_headers_stream.cc

 // Copyright 2013 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_headers_stream.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 17 matching lines @@
 
 class HeaderTableDebugVisitor : public HpackHeaderTable::DebugVisitorInterface {
  public:
   HeaderTableDebugVisitor(
       const QuicClock* clock,
       std::unique_ptr<QuicHeadersStream::HpackDebugVisitor> visitor)
       : clock_(clock), headers_stream_hpack_visitor_(std::move(visitor)) {}
 
   int64_t OnNewEntry(const HpackEntry& entry) override {
     DVLOG(1) << entry.GetDebugString();
-    return clock_->ApproximateNow().Subtract(QuicTime::Zero()).ToMicroseconds();
+    return (clock_->ApproximateNow() - QuicTime::Zero()).ToMicroseconds();
   }
 
   void OnUseEntry(const HpackEntry& entry) override {
     const QuicTime::Delta elapsed(
-        clock_->ApproximateNow()
-            .Subtract(QuicTime::Delta::FromMicroseconds(entry.time_added()))
-            .Subtract(QuicTime::Zero()));
+        clock_->ApproximateNow() -
+        QuicTime::Delta::FromMicroseconds(entry.time_added()) -
+        QuicTime::Zero());
     DVLOG(1) << entry.GetDebugString() << " " << elapsed.ToMilliseconds()
              << " ms";
     headers_stream_hpack_visitor_->OnUseEntry(elapsed);
   }
 
  private:
   const QuicClock* clock_;
   std::unique_ptr<QuicHeadersStream::HpackDebugVisitor>
       headers_stream_hpack_visitor_;
 
@@ skipping 445 matching lines @@
   DCHECK_EQ(stream_id_, stream_id);
   if (len == 0) {
     DCHECK_NE(0u, stream_id_);
     DCHECK_NE(0u, frame_len_);
     if (measure_headers_hol_blocking_time_) {
       if (prev_max_timestamp_ > cur_max_timestamp_) {
         // prev_max_timestamp_ > cur_max_timestamp_ implies that
         // headers from lower numbered streams actually came off the
         // wire after headers for the current stream, hence there was
         // HOL blocking.
-        QuicTime::Delta delta(prev_max_timestamp_.Subtract(cur_max_timestamp_));
+        QuicTime::Delta delta = prev_max_timestamp_ - cur_max_timestamp_;
         DVLOG(1) << "stream " << stream_id
                  << ": Net.QuicSession.HeadersHOLBlockedTime "
                  << delta.ToMilliseconds();
         spdy_session_->OnHeadersHeadOfLineBlocking(delta);
       }
       prev_max_timestamp_ = std::max(prev_max_timestamp_, cur_max_timestamp_);
       cur_max_timestamp_ = QuicTime::Zero();
     }
     if (promised_stream_id_ == kInvalidStreamId) {
       spdy_session_->OnStreamHeadersComplete(stream_id_, fin_, frame_len_);
@@ skipping 26 matching lines @@
 
 void QuicHeadersStream::OnHeaderList(const QuicHeaderList& header_list) {
   DVLOG(1) << "Received header list for stream " << stream_id_ << ": "
            << header_list.DebugString();
   if (measure_headers_hol_blocking_time_) {
     if (prev_max_timestamp_ > cur_max_timestamp_) {
       // prev_max_timestamp_ > cur_max_timestamp_ implies that
       // headers from lower numbered streams actually came off the
       // wire after headers for the current stream, hence there was
       // HOL blocking.
-      QuicTime::Delta delta = prev_max_timestamp_.Subtract(cur_max_timestamp_);
+      QuicTime::Delta delta = prev_max_timestamp_ - cur_max_timestamp_;
       DVLOG(1) << "stream " << stream_id_
                << ": Net.QuicSession.HeadersHOLBlockedTime "
                << delta.ToMilliseconds();
       spdy_session_->OnHeadersHeadOfLineBlocking(delta);
     }
     prev_max_timestamp_ = std::max(prev_max_timestamp_, cur_max_timestamp_);
     cur_max_timestamp_ = QuicTime::Zero();
   }
   if (promised_stream_id_ == kInvalidStreamId) {
     spdy_session_->OnStreamHeaderList(stream_id_, fin_, frame_len_,
@@ skipping 69 matching lines @@
     return true;
   }
   frame_len_ -= len;
   // Ignore fin_ while there is more data coming, if frame_len_ > 0.
   spdy_session_->OnStreamFrameData(stream_id, data, len,
                                    frame_len_ > 0 ? false : fin_);
   return true;
 }
 
 }  // namespace net