| commit | 08b0143887b593fd46819ebcebfd07b1181cf0f5 | [log] [tgz] |
|---|---|---|
| author | rtenneti <[email protected]> | Wed Oct 29 14:03:19 2014 |
| committer | Commit bot <[email protected]> | Wed Oct 29 14:03:46 2014 |
| tree | eb5d4727d98bea1ed766a49c3b84464c2a81fe72 | |
| parent | c57b93f1e66e06bbddb07348a2816aa4a7df1051 [diff] [blame] |
Land Recent QUIC Changes. Add a new QUIC common cert set to reflect the new GIA cert. Also rename the existing common cert set *.inc files. Merge internal change: 78450265 https://codereview.chromium.org/683343002/ Removes QuicTcpCongestionWindow type and adds a new QuicPacketCount type. The CL also moves to using QuicPacketCount instead of QuicTcpCongestionWindow in TCP congestion control code. Using a QuicPacketCount type makes it obvious for congestion control computations that a variable of this type needs to be converted when comparing with other congestion control variables (such as |bytes_in_flight|) that are maintained as QuicByteCount. As a type, QuicTcpCongestionWindow currently doesn't seem to have any other semantic value. Merge internal change: 78399967 https://codereview.chromium.org/644853004/ Fix flaky test in QuicSessionTest. Port of https://codereview.chromium.org/669963003/ to internal source tree. Merge internal change: 78351892 This CL was already in chromium except for small comment change. https://codereview.chromium.org/684783006/ Stop sending QUIC SCUP message immediately after handshake. Merge internal change: 78296626 https://codereview.chromium.org/684983002/ Delete rolled out FLAGS_quic_store_cached_network_params_from_chlo Merge internal change: 78276864 https://codereview.chromium.org/669663004/ Modifies RTT code to use uncorrected measured rtt for min_rtt and to only correct for ack_delay when recording smoothed_rtt and when ack_delay is sane. Merge internal change: 78269418 https://codereview.chromium.org/685893002/ Flag protect enabling of QUIC's BBR congestion control algorithm. Merge internal change: 78229291 https://codereview.chromium.org/687643004/ Further simplify QUIC's UnackedPacketMap now that the interface is unified on AddSentPacket. Merge internal change: 78219252 https://codereview.chromium.org/685883004/ [email protected], [email protected], [email protected] Review URL: https://codereview.chromium.org/689483002 Cr-Commit-Position: refs/heads/master@{#301825}
diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h index 7d46719..96e18d42 100644 --- a/net/quic/quic_protocol.h +++ b/net/quic/quic_protocol.h
@@ -1063,14 +1063,9 @@ // Constructs a Transmission with a new all_tranmissions set // containing |sequence_number|. TransmissionInfo(RetransmittableFrames* retransmittable_frames, - QuicSequenceNumberLength sequence_number_length); - - // Constructs a Transmission with the specified |all_tranmissions| set - // and inserts |sequence_number| into it. - TransmissionInfo(RetransmittableFrames* retransmittable_frames, QuicSequenceNumberLength sequence_number_length, TransmissionType transmission_type, - SequenceNumberList* all_transmissions); + QuicTime sent_time); RetransmittableFrames* retransmittable_frames; QuicSequenceNumberLength sequence_number_length;