| 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 6526b15ef9aecf3153b28fe7353b74dfb1009ce4..49359f7530d62b40fb43c46ada3cca5214d0ddc9 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
|
| @@ -219,8 +219,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)
|
| @@ -309,6 +311,8 @@ const char* pseudoTypeToString(CSSSelector::PseudoType pseudoType) {
|
| DEFINE_STRING_MAPPING(PseudoHostHasAppearance)
|
| DEFINE_STRING_MAPPING(PseudoVideoPersistent)
|
| DEFINE_STRING_MAPPING(PseudoVideoPersistentAncestor)
|
| + /* DO NOT SUBMIT - conflict resolution helper:
|
| + * Important to have PseudoHostHasAppearance (not kPseudoHost...) above. */
|
| #undef DEFINE_STRING_MAPPING
|
| }
|
|
|
|
|