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

third_party/WebKit/Source/platform/heap/BlinkGC.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BlinkGC_h
 #define BlinkGC_h
 
 // BlinkGC.h is a file that defines common things used by Blink GC.
 
 #include "platform/PlatformExport.h"
@@ skipping 30 matching lines @@
                                       size_t);
 
 // List of typed arenas. The list is used to generate the implementation
 // of typed arena related methods.
 //
 // To create a new typed arena add a H(<ClassName>) to the
 // FOR_EACH_TYPED_ARENA macro below.
 #define FOR_EACH_TYPED_ARENA(H) \
   H(Node)                       \
   H(CSSValue)
+  /* DO NOT SUBMIT - Conflict resolution helper:
+   * Important to have CSSValue and Node rather than kCSSValue or kNode above */
 
-#define TypedArenaEnumName(Type) Type##ArenaIndex,
+#define TypedArenaEnumName(Type) k##Type##ArenaIndex,
 
 class PLATFORM_EXPORT BlinkGC final {
   STATIC_ONLY(BlinkGC);
 
  public:
   // When garbage collecting we need to know whether or not there
   // can be pointers to Blink GC managed objects on the stack for
   // each thread. When threads reach a safe point they record
   // whether or not they have pointers on the stack.
   enum StackState { NoHeapPointersOnStack, HeapPointersOnStack };
@@ skipping 45 matching lines @@
 
   enum ThreadHeapMode {
     MainThreadHeapMode,
     PerThreadHeapMode,
   };
 };
 
 }  // namespace blink
 
 #endif