ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

third_party/WebKit/Source/platform/heap/ThreadState.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1281 matching lines @@
                                      1024);
     DEFINE_STATIC_LOCAL(CustomCountHistogram, collectionRateHistogram,
                         ("BlinkGC.CollectionRate", 1, 100, 20));
     collectionRateHistogram.count(static_cast<int>(100 * collectionRate));
     DEFINE_STATIC_LOCAL(
         CustomCountHistogram, timeForSweepHistogram,
         ("BlinkGC.TimeForSweepingAllObjects", 1, 10 * 1000, 50));
     timeForSweepHistogram.count(m_accumulatedSweepingTime);
 
 #define COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(GCReason)              \
-  case BlinkGC::GCReason: {                                                 \
+  case BlinkGC::k##GCReason: {                                                 \
     DEFINE_STATIC_LOCAL(CustomCountHistogram, histogram,                    \
                         ("BlinkGC.CollectionRate_" #GCReason, 1, 100, 20)); \
     histogram.count(static_cast<int>(100 * collectionRate));                \
     break;                                                                  \
   }
 
-    switch (m_heap->lastGCReason()) {
+    switch (heap_->lastGCReason()) {
+      /* DO NOT SUBMIT - Conflict resolution helper:
+       * important to use IdleGC, rather than kIdleGC below - stringification */
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(IdleGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(PreciseGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(ConservativeGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(ForcedGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(MemoryPressureGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(PageNavigationGC)
+      /* DO NOT SUBMIT - Conflict resolution helper:
+       * important to use IdleGC, rather than kIdleGC above - stringification */
       default:
         break;
     }
   }
 
   switch (gcState()) {
     case Sweeping:
       setGCState(NoGCScheduled);
       break;
     case SweepingAndPreciseGCScheduled:
@@ skipping 308 matching lines @@
                                          static_cast<unsigned long>(m_thread));
   const String heapsDumpName = threadDumpName + "/heaps";
   const String classesDumpName = threadDumpName + "/classes";
 
   int numberOfHeapsReported = 0;
 #define SNAPSHOT_HEAP(ArenaType)                                        \
   {                                                                     \
     numberOfHeapsReported++;                                            \
     switch (type) {                                                     \
       case SnapshotType::HeapSnapshot:                                  \
-        m_arenas[BlinkGC::ArenaType##ArenaIndex]->takeSnapshot(         \
+        m_arenas[BlinkGC::k##ArenaType##ArenaIndex]->takeSnapshot(         \
             heapsDumpName + "/" #ArenaType, info);                      \
         break;                                                          \
       case SnapshotType::FreelistSnapshot:                              \
-        m_arenas[BlinkGC::ArenaType##ArenaIndex]->takeFreelistSnapshot( \
+        m_arenas[BlinkGC::k##ArenaType##ArenaIndex]->takeFreelistSnapshot( \
             heapsDumpName + "/" #ArenaType);                            \
         break;                                                          \
       default:                                                          \
         ASSERT_NOT_REACHED();                                           \
     }                                                                   \
   }
 
+  /* DO NOT SUBMIT - Conflict resolution helper:
+   * Important to use NormalPage instead of kNormalPage1 below */
   SNAPSHOT_HEAP(NormalPage1);
   SNAPSHOT_HEAP(NormalPage2);
   SNAPSHOT_HEAP(NormalPage3);
   SNAPSHOT_HEAP(NormalPage4);
   SNAPSHOT_HEAP(EagerSweep);
   SNAPSHOT_HEAP(Vector1);
   SNAPSHOT_HEAP(Vector2);
   SNAPSHOT_HEAP(Vector3);
   SNAPSHOT_HEAP(Vector4);
   SNAPSHOT_HEAP(InlineVector);
   SNAPSHOT_HEAP(HashTable);
   SNAPSHOT_HEAP(LargeObject);
+  /* DO NOT SUBMIT - Conflict resolution helper:
+   * Important to use LargeObject instead of kLargeObject above */
   FOR_EACH_TYPED_ARENA(SNAPSHOT_HEAP);
 
   ASSERT(numberOfHeapsReported == BlinkGC::NumberOfArenas);
 
 #undef SNAPSHOT_HEAP
 
   if (type == SnapshotType::FreelistSnapshot)
     return;
 
   size_t totalLiveCount = 0;
@@ skipping 199 matching lines @@
     collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep,
                    BlinkGC::ForcedGC);
     size_t liveObjects = heap().heapStats().markedObjectSize();
     if (liveObjects == previousLiveObjects)
       break;
     previousLiveObjects = liveObjects;
   }
 }
 
 }  // namespace blink