Revert of Removing duplicate functions and symbol names in core/css

third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp

Index: third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp
diff --git a/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp b/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp
index 760b2a8c0cb7484053ce6163e743d1f2825b09a5..ea4273b00b18559b74d4b980c91198e6cfd66d0a 100644
--- a/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp
+++ b/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp
@@ -24,10 +24,10 @@
 // To minimize performance impact, we wrap trace events with a lookup of
 // cached flag. The cached flag is made "static const" and is not shared
 // with InvalidationSet to avoid additional GOT lookup cost.
-static const unsigned char* s_styleInvalidatorTracingEnabled = nullptr;
+static const unsigned char* s_tracingEnabled = nullptr;
 
 #define TRACE_STYLE_INVALIDATOR_INVALIDATION_IF_ENABLED(element, reason) \
-  if (UNLIKELY(*s_styleInvalidatorTracingEnabled))                       \
+  if (UNLIKELY(*s_tracingEnabled))                                       \
     TRACE_STYLE_INVALIDATOR_INVALIDATION(element, reason);
 
 void StyleInvalidator::invalidate(Document& document) {
@@ -170,7 +170,7 @@
 }
 
 StyleInvalidator::StyleInvalidator() {
-  s_styleInvalidatorTracingEnabled = TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
+  s_tracingEnabled = TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
       TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"));
   InvalidationSet::cacheTracingFlag();
 }
@@ -299,7 +299,7 @@
       CHECK(invalidationSet->isAlive());
       recursionData.pushInvalidationSet(*invalidationSet);
     }
-    if (UNLIKELY(*s_styleInvalidatorTracingEnabled)) {
+    if (UNLIKELY(*s_tracingEnabled)) {
       TRACE_EVENT_INSTANT1(
           TRACE_DISABLED_BY_DEFAULT("devtools.timeline.invalidationTracking"),
           "StyleInvalidatorInvalidationTracking", TRACE_EVENT_SCOPE_THREAD,