Backed out changeset f334593f5b54 (bug 1877273) for causing non-unifi…

…ed build bustages on UseCounterMetrics.cpp.

UltraBlame original commit: 82ef966ee2cb7bc65ca630633933207a43cb3f8b

dom/base/Document.cpp

@@ -999,6 +999,15 @@ include
 "
 mozilla
 /
+TelemetryHistogramEnums
+.
+h
+"
+#
+include
+"
+mozilla
+/
 TelemetryScalarEnums
 .
 h
@@ -76170,6 +76179,251 @@ mSandboxFlags
 SANDBOXED_SCRIPTS
 ;
 }
+static_assert
+(
+size_t
+(
+eUseCounter_EndCSSProperties
+)
+-
+size_t
+(
+eUseCounter_FirstCSSProperty
+)
+=
+=
+size_t
+(
+eCSSProperty_COUNT_with_aliases
+)
+"
+We
+should
+have
+the
+right
+amount
+of
+CSS
+property
+use
+counters
+"
+)
+;
+static_assert
+(
+size_t
+(
+eUseCounter_Count
+)
+-
+size_t
+(
+eUseCounter_FirstCountedUnknownProperty
+)
+=
+=
+size_t
+(
+CountedUnknownProperty
+:
+:
+Count
+)
+"
+We
+should
+have
+the
+right
+amount
+of
+counted
+unknown
+properties
+"
+"
+use
+counters
+"
+)
+;
+static_assert
+(
+size_t
+(
+eUseCounter_Count
+)
+*
+2
+=
+=
+size_t
+(
+Telemetry
+:
+:
+HistogramUseCounterCount
+)
+"
+There
+should
+be
+two
+histograms
+(
+document
+and
+page
+)
+"
+"
+for
+each
+use
+counter
+"
+)
+;
+#
+define
+ASSERT_CSS_COUNTER
+(
+id_
+method_
+)
+\
+static_assert
+(
+size_t
+(
+eUseCounter_property_
+#
+#
+method_
+)
+-
+\
+size_t
+(
+eUseCounter_FirstCSSProperty
+)
+=
+=
+\
+size_t
+(
+id_
+)
+\
+"
+Order
+for
+CSS
+counters
+and
+CSS
+property
+id
+should
+match
+"
+)
+;
+#
+define
+CSS_PROP_PUBLIC_OR_PRIVATE
+(
+publicname_
+privatename_
+)
+privatename_
+#
+define
+CSS_PROP_LONGHAND
+(
+name_
+id_
+method_
+.
+.
+.
+)
+\
+ASSERT_CSS_COUNTER
+(
+eCSSProperty_
+#
+#
+id_
+method_
+)
+#
+define
+CSS_PROP_SHORTHAND
+(
+name_
+id_
+method_
+.
+.
+.
+)
+\
+ASSERT_CSS_COUNTER
+(
+eCSSProperty_
+#
+#
+id_
+method_
+)
+#
+define
+CSS_PROP_ALIAS
+(
+name_
+aliasid_
+id_
+method_
+.
+.
+.
+)
+\
+ASSERT_CSS_COUNTER
+(
+eCSSPropertyAlias_
+#
+#
+aliasid_
+method_
+)
+#
+include
+"
+mozilla
+/
+ServoCSSPropList
+.
+h
+"
+#
+undef
+CSS_PROP_ALIAS
+#
+undef
+CSS_PROP_SHORTHAND
+#
+undef
+CSS_PROP_LONGHAND
+#
+undef
+CSS_PROP_PUBLIC_OR_PRIVATE
+#
+undef
+ASSERT_CSS_COUNTER
 void
 Document
 :
@@ -76326,6 +76580,16 @@ mUseCountersInitialized
 =
 true
 ;
+static_assert
+(
+Telemetry
+:
+:
+HistogramUseCounterCount
+>
+0
+)
+;
 if
 (
 !
@@ -76506,6 +76770,18 @@ mReportedDocumentUseCounters
 =
 true
 ;
+Telemetry
+:
+:
+Accumulate
+(
+Telemetry
+:
+:
+CONTENT_DOCUMENTS_DESTROYED
+1
+)
+;
 glean
 :
 :
@@ -76624,15 +76900,25 @@ uc
 continue
 ;
 }
-const
-char
-*
-metricName
+auto
+id
 =
-IncrementUseCounter
+static_cast
+<
+Telemetry
+:
+:
+HistogramID
+>
 (
+Telemetry
+:
+:
+HistogramFirstUseCounter
++
 uc
-false
+*
+2
 )
 ;
 if
@@ -76653,7 +76939,13 @@ s
 \
 n
 "
-metricName
+Telemetry
+:
+:
+GetHistogramName
+(
+id
+)
 urlForLogging
 -
 >
@@ -76663,6 +76955,21 @@ get
 )
 ;
 }
+Telemetry
+:
+:
+Accumulate
+(
+id
+1
+)
+;
+IncrementUseCounter
+(
+uc
+false
+)
+;
 }
 }
 void

dom/base/UseCounterMetrics.h

@@ -33,9 +33,7 @@ WorkerKind
 :
 uint8_t
 ;
-const
-char
-*
+void
 IncrementUseCounter
 (
 UseCounter
@@ -44,9 +42,7 @@ bool
 aIsPage
 )
 ;
-const
-char
-*
+void
 IncrementWorkerUseCounter
 (
 UseCounterWorker