Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Unified Diff: net/quic/quic_alarm.h

Issue 1572353002: QuicAlarms are now allocated out of an arena in QuicConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge recent changes. Created 4 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gypi ('k') | net/quic/quic_alarm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_alarm.h
diff --git a/net/quic/quic_alarm.h b/net/quic/quic_alarm.h
index 48cd5ef0b3f02b52aeef706993c945cc2c0cc562..a775cfb523968f72e95b72981643c45552c7f5b0 100644
--- a/net/quic/quic_alarm.h
+++ b/net/quic/quic_alarm.h
@@ -8,6 +8,7 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "net/base/net_export.h"
+#include "net/quic/quic_arena_scoped_ptr.h"
#include "net/quic/quic_time.h"
namespace net {
@@ -29,7 +30,7 @@ class NET_EXPORT_PRIVATE QuicAlarm {
virtual QuicTime OnAlarm() = 0;
};
- explicit QuicAlarm(Delegate* delegate);
+ explicit QuicAlarm(QuicArenaScopedPtr<Delegate> delegate);
virtual ~QuicAlarm();
// Sets the alarm to fire at |deadline|. Must not be called while
@@ -72,7 +73,7 @@ class NET_EXPORT_PRIVATE QuicAlarm {
void Fire();
private:
- scoped_ptr<Delegate> delegate_;
+ QuicArenaScopedPtr<Delegate> delegate_;
QuicTime deadline_;
DISALLOW_COPY_AND_ASSIGN(QuicAlarm);
« no previous file with comments | « net/net.gypi ('k') | net/quic/quic_alarm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698