Index: third_party/WebKit/Source/platform/wtf/HashTable.h |
diff --git a/third_party/WebKit/Source/platform/wtf/HashTable.h b/third_party/WebKit/Source/platform/wtf/HashTable.h |
index 0afa349c96385cbc61705d3b19affea4ddfeb2b8..3e619e07d95fc05d4c8d82ba83940cf552c56134 100644 |
--- a/third_party/WebKit/Source/platform/wtf/HashTable.h |
+++ b/third_party/WebKit/Source/platform/wtf/HashTable.h |
@@ -23,6 +23,7 @@ |
#ifndef WTF_HashTable_h |
#define WTF_HashTable_h |
+#include <memory> |
#include "platform/wtf/Alignment.h" |
#include "platform/wtf/Allocator.h" |
#include "platform/wtf/Assertions.h" |
@@ -30,7 +31,6 @@ |
#include "platform/wtf/HashTraits.h" |
#include "platform/wtf/PtrUtil.h" |
#include "platform/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 "platform/wtf/DataLog.h" |
#include <type_traits> |
+#include "platform/wtf/DataLog.h" |
#endif |
#if DUMP_HASHTABLE_STATS |
@@ -2112,11 +2112,11 @@ void HashTable<Key, |
if (!IsTraceableInCollectionTrait<Traits>::value) |
return; |
if (Traits::kWeakHandlingFlag == kWeakHandlingInCollections) { |
- // 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 |