| Index: third_party/WebKit/Source/platform/heap/BlinkGC.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/BlinkGC.h b/third_party/WebKit/Source/platform/heap/BlinkGC.h
|
| index 1790076fb96a1d0209efe2c9c4bf2ff7805faa38..ffe4628f4d5bbf73e2f9cfd649bfb0d33687ddda 100644
|
| --- a/third_party/WebKit/Source/platform/heap/BlinkGC.h
|
| +++ b/third_party/WebKit/Source/platform/heap/BlinkGC.h
|
| @@ -48,8 +48,6 @@ using MovingObjectCallback = void (*)(void* callback_data,
|
| #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) k##Type##ArenaIndex,
|
|
|
|
|