Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp

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:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
index 5dc986274876b984db8f1e365f266cf6f7bcee30..0a57f83770216cb8e3d09d921ddc6d4fb3132378 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
@@ -75,8 +75,10 @@ void setNodeInfo(TracedValue* value,
const char* pseudoTypeToString(CSSSelector::PseudoType pseudoType) {
switch (pseudoType) {
#define DEFINE_STRING_MAPPING(pseudoType) \
- case CSSSelector::pseudoType: \
+ case CSSSelector::k##pseudoType: \
return #pseudoType;
+ /* DO NOT SUBMIT - conflict resolution helper:
+ * Important to have PseudoUnknown instead of kPseudoUnknown below. */
DEFINE_STRING_MAPPING(PseudoUnknown)
DEFINE_STRING_MAPPING(PseudoEmpty)
DEFINE_STRING_MAPPING(PseudoFirstChild)
@@ -163,6 +165,8 @@ const char* pseudoTypeToString(CSSSelector::PseudoType pseudoType) {
DEFINE_STRING_MAPPING(PseudoSpatialNavigationFocus)
DEFINE_STRING_MAPPING(PseudoListBox)
DEFINE_STRING_MAPPING(PseudoHostHasAppearance)
+ /* DO NOT SUBMIT - conflict resolution helper:
+ * Important to have PseudoHostHasAppearance (not kPseudoHost...) above. */
#undef DEFINE_STRING_MAPPING
}

Powered by Google App Engine
This is Rietveld 408576698