net/quic/quic_connection_helper.cc - Issue 15937012: Land Recent QUIC changes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/quic/quic_connection_helper.cc

Issue 15937012: Land Recent QUIC changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Small bug fixes Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/quic/quic_connection_helper.cc

diff --git a/net/quic/quic_connection_helper.cc b/net/quic/quic_connection_helper.cc

index 1a48ff1dc38f3a13c006de25dd266fe98096c853..ec2866ee1168018212bb507e0ecc732aa2d53b0c 100644

--- a/net/quic/quic_connection_helper.cc

+++ b/net/quic/quic_connection_helper.cc

@@ -117,7 +117,10 @@ void QuicConnectionHelper::SetSendAlarm(QuicTime alarm_time) {

}

void QuicConnectionHelper::SetTimeoutAlarm(QuicTime::Delta delay) {

- DCHECK(!timeout_alarm_registered_);

+ // CheckForTimeout will call SetTimeoutAlarm for the remaining time if alarm

+ // goes off before the delay.

+ if (timeout_alarm_registered_)

+ return;

timeout_alarm_registered_ = true;

task_runner_->PostDelayedTask(

FROM_HERE,