| Index: third_party/WebKit/Source/wtf/HashTable.h
|
| diff --git a/third_party/WebKit/Source/wtf/HashTable.h b/third_party/WebKit/Source/wtf/HashTable.h
|
| index dc707ef81fbc6f099030a89a3be1e43798a284c5..b5221261dd69fb3c3e7bee0089bb52332bb15fb8 100644
|
| --- a/third_party/WebKit/Source/wtf/HashTable.h
|
| +++ b/third_party/WebKit/Source/wtf/HashTable.h
|
| @@ -23,6 +23,7 @@
|
| #ifndef WTF_HashTable_h
|
| #define WTF_HashTable_h
|
|
|
| +#include <memory>
|
| #include "wtf/Alignment.h"
|
| #include "wtf/Allocator.h"
|
| #include "wtf/Assertions.h"
|
| @@ -30,7 +31,6 @@
|
| #include "wtf/HashTraits.h"
|
| #include "wtf/PtrUtil.h"
|
| #include "wtf/allocator/PartitionAllocator.h"
|
| -#include <memory>
|
|
|
| #define DUMP_HASHTABLE_STATS 0
|
| #define DUMP_HASHTABLE_STATS_PER_TABLE 0
|
| @@ -41,8 +41,8 @@
|
| #endif
|
|
|
| #if DUMP_HASHTABLE_STATS_PER_TABLE
|
| -#include "wtf/DataLog.h"
|
| #include <type_traits>
|
| +#include "wtf/DataLog.h"
|
| #endif
|
|
|
| #if DUMP_HASHTABLE_STATS
|
| @@ -2103,11 +2103,11 @@ void HashTable<Key,
|
| if (!IsTraceableInCollectionTrait<Traits>::value)
|
| return;
|
| if (Traits::weakHandlingFlag == WeakHandlingInCollections) {
|
| - // If we have both strong and weak pointers in the collection then
|
| - // we queue up the collection for fixed point iteration a la
|
| - // Ephemerons:
|
| - // http://dl.acm.org/citation.cfm?doid=263698.263733 - see also
|
| - // http://www.jucs.org/jucs_14_21/eliminating_cycles_in_weak
|
| +// If we have both strong and weak pointers in the collection then
|
| +// we queue up the collection for fixed point iteration a la
|
| +// Ephemerons:
|
| +// http://dl.acm.org/citation.cfm?doid=263698.263733 - see also
|
| +// http://www.jucs.org/jucs_14_21/eliminating_cycles_in_weak
|
| #if DCHECK_IS_ON()
|
| DCHECK(!enqueued() || Allocator::weakTableRegistered(visitor, this));
|
| #endif
|
|
|