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

Unified Diff: net/quic/quic_one_block_arena.h

Issue 1660533002: Landing Recent QUIC changes until 01/26/2016 18:14 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/quic/quic_flags.cc ('k') | net/quic/quic_one_block_arena_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_one_block_arena.h
diff --git a/net/quic/quic_one_block_arena.h b/net/quic/quic_one_block_arena.h
index b4d65e2fe8f9ecf95838ce929a412973d6d4cbd0..6a2e6c894f3b8e32004a3e3b93b3134be6f576c4 100644
--- a/net/quic/quic_one_block_arena.h
+++ b/net/quic/quic_one_block_arena.h
@@ -59,9 +59,6 @@ QuicArenaScopedPtr<T> QuicOneBlockArena<ArenaSize>::New(Args&&... args) {
<< "Object is too large for the arena.";
static_assert(QUIC_ALIGN_OF(T) > 1,
"Objects added to the arena must be at least 2B aligned.");
- if (!FLAGS_quic_enable_arena_allocation) {
- return QuicArenaScopedPtr<T>(new T(std::forward<Args>(args)...));
- }
if (PREDICT_FALSE(offset_ > ArenaSize - AlignedSize<T>())) {
LOG(DFATAL) << "Ran out of space in QuicOneBlockArena at " << this
<< ", max size was " << ArenaSize << ", failing request was "
« no previous file with comments | « net/quic/quic_flags.cc ('k') | net/quic/quic_one_block_arena_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698