third_party/WebKit/Source/platform/heap/BlinkGC.h - Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/heap/BlinkGC.h

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

Patch Set: Inducing merge conflicts to force human review and changes after rename. Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 d05033fd22f7c0cf62a90b876ea81f614f06c326..1b04304e4d9985cc6e39be197efdd9bada0b2518 100644

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

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

@@ -48,8 +48,10 @@ using MovingObjectCallback = void (*)(void* callbackData,

#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);