From 7030f16e2c84f8c1cf61d448ca0a842f27263d8b Mon Sep 17 00:00:00 2001 From: Chris H-C Date: Mon, 16 Dec 2024 21:30:23 +0000 Subject: [PATCH] Bug 1936822 - Remove unused A11Y_ flag histograms r=morgan Differential Revision: https://phabricator.services.mozilla.com/D231948 --- accessible/base/Statistics.h | 18 ------------- accessible/base/nsAccessibilityService.cpp | 3 --- accessible/windows/ia2/ia2AccessibleTable.cpp | 2 -- accessible/windows/msaa/MsaaAccessible.cpp | 2 -- accessible/windows/msaa/MsaaDocAccessible.cpp | 2 -- toolkit/components/telemetry/Histograms.json | 26 ------------------- .../telemetry/histogram-allowlists.json | 7 ----- 7 files changed, 60 deletions(-) diff --git a/accessible/base/Statistics.h b/accessible/base/Statistics.h index 19f7166317f2..4882880245af 100644 --- a/accessible/base/Statistics.h +++ b/accessible/base/Statistics.h @@ -13,28 +13,10 @@ namespace mozilla { namespace a11y { namespace statistics { -inline void A11yInitialized() { - Telemetry::Accumulate(Telemetry::A11Y_INSTANTIATED_FLAG, true); -} - inline void A11yConsumers(uint32_t aConsumer) { Telemetry::Accumulate(Telemetry::A11Y_CONSUMERS, aConsumer); } -/** - * Report that ISimpleDOM* has been used. - */ -inline void ISimpleDOMUsed() { - Telemetry::Accumulate(Telemetry::A11Y_ISIMPLEDOM_USAGE_FLAG, true); -} - -/** - * Report that IAccessibleTable has been used. - */ -inline void IAccessibleTableUsed() { - Telemetry::Accumulate(Telemetry::A11Y_IATABLE_USAGE_FLAG, true); -} - } // namespace statistics } // namespace a11y } // namespace mozilla diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp index 2cef110d92c4..e2caee7ad128 100644 --- a/accessible/base/nsAccessibilityService.cpp +++ b/accessible/base/nsAccessibilityService.cpp @@ -40,7 +40,6 @@ # include "RootAccessibleWrap.h" #endif #include "States.h" -#include "Statistics.h" #include "TextLeafAccessible.h" #include "xpcAccessibleApplication.h" @@ -1592,8 +1591,6 @@ bool nsAccessibilityService::Init(uint64_t aCacheDomains) { // domains that we activate based on information about the instantiator. gCacheDomains = ::GetCacheDomainsForKnownClients(aCacheDomains); - statistics::A11yInitialized(); - static const char16_t kInitIndicator[] = {'1', 0}; observerService->NotifyObservers(nullptr, "a11y-init-or-shutdown", kInitIndicator); diff --git a/accessible/windows/ia2/ia2AccessibleTable.cpp b/accessible/windows/ia2/ia2AccessibleTable.cpp index 9ce94e83484f..12593748fc21 100644 --- a/accessible/windows/ia2/ia2AccessibleTable.cpp +++ b/accessible/windows/ia2/ia2AccessibleTable.cpp @@ -16,7 +16,6 @@ #include "mozilla/a11y/TableAccessible.h" #include "nsCOMPtr.h" #include "nsString.h" -#include "Statistics.h" using namespace mozilla::a11y; @@ -34,7 +33,6 @@ ia2AccessibleTable::QueryInterface(REFIID iid, void** ppv) { *ppv = nullptr; if (IID_IAccessibleTable == iid) { - statistics::IAccessibleTableUsed(); *ppv = static_cast(this); (reinterpret_cast(*ppv))->AddRef(); return S_OK; diff --git a/accessible/windows/msaa/MsaaAccessible.cpp b/accessible/windows/msaa/MsaaAccessible.cpp index 6da568e13bb7..519322522afa 100644 --- a/accessible/windows/msaa/MsaaAccessible.cpp +++ b/accessible/windows/msaa/MsaaAccessible.cpp @@ -27,7 +27,6 @@ #include "sdnTextAccessible.h" #include "HyperTextAccessible-inl.h" #include "ServiceProvider.h" -#include "Statistics.h" #include "ARIAMap.h" #include "mozilla/PresShell.h" @@ -564,7 +563,6 @@ MsaaAccessible::QueryInterface(REFIID iid, void** ppv) { *ppv = static_cast(new sdnAccessible(WrapNotNull(this))); } else if (iid == IID_ISimpleDOMText && localAcc && localAcc->IsTextLeaf()) { - statistics::ISimpleDOMUsed(); *ppv = static_cast(new sdnTextAccessible(this)); static_cast(*ppv)->AddRef(); return S_OK; diff --git a/accessible/windows/msaa/MsaaDocAccessible.cpp b/accessible/windows/msaa/MsaaDocAccessible.cpp index 615f2e5d39e3..b8b66f45feff 100644 --- a/accessible/windows/msaa/MsaaDocAccessible.cpp +++ b/accessible/windows/msaa/MsaaDocAccessible.cpp @@ -12,7 +12,6 @@ #include "nsAccessibilityService.h" #include "nsAccUtils.h" #include "nsWinUtils.h" -#include "Statistics.h" #include "sdnDocAccessible.h" #include "mozilla/a11y/Role.h" #include "ISimpleDOM.h" @@ -54,7 +53,6 @@ MsaaDocAccessible* MsaaDocAccessible::GetFromOwned(Accessible* aAcc) { // IUnknown IMPL_IUNKNOWN_QUERY_HEAD(MsaaDocAccessible) if (aIID == IID_ISimpleDOMDocument && LocalAcc()) { - statistics::ISimpleDOMUsed(); *aInstancePtr = static_cast(new sdnDocAccessible(this)); static_cast(*aInstancePtr)->AddRef(); return S_OK; diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 66286dcdfa27..cd7954f2c860 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -1,14 +1,4 @@ { - "A11Y_INSTANTIATED_FLAG": { - "record_in_processes": ["main"], - "products": ["firefox", "fennec"], - "expires_in_version": "never", - "kind": "flag", - "releaseChannelCollection": "opt-out", - "bug_numbers": [1382820], - "description": "Flag indicating accessibility support has been instantiated.", - "alert_emails": ["accessibility@mozilla.com"] - }, "A11Y_CONSUMERS": { "record_in_processes": ["main"], "products": ["firefox", "fennec"], @@ -20,22 +10,6 @@ "description": "A list of known accessibility clients that inject into Firefox process space (see https://searchfox.org/mozilla-central/source/accessible/windows/msaa/Compatibility.h).", "alert_emails": ["accessibility@mozilla.com", "jteh@mozilla.com"] }, - "A11Y_ISIMPLEDOM_USAGE_FLAG": { - "record_in_processes": ["main"], - "products": ["firefox", "fennec"], - "expires_in_version": "default", - "kind": "flag", - "description": "Flag indicating the ISimpleDOM* accessibility interfaces has been used.", - "alert_emails": ["accessibility@mozilla.com"] - }, - "A11Y_IATABLE_USAGE_FLAG": { - "record_in_processes": ["main"], - "products": ["firefox", "fennec"], - "expires_in_version": "default", - "kind": "flag", - "description": "Flag indicating the IAccessibleTable accessibility interface has been used.", - "alert_emails": ["accessibility@mozilla.com"] - }, "A11Y_TREE_UPDATE_TIMING_MS": { "record_in_processes": ["main", "content"], "products": ["firefox", "fennec"], diff --git a/toolkit/components/telemetry/histogram-allowlists.json b/toolkit/components/telemetry/histogram-allowlists.json index 5c271d10edaa..f4378594c6bb 100644 --- a/toolkit/components/telemetry/histogram-allowlists.json +++ b/toolkit/components/telemetry/histogram-allowlists.json @@ -164,8 +164,6 @@ "XMLHTTPREQUEST_ASYNC_OR_SYNC" ], "bug_numbers": [ - "A11Y_IATABLE_USAGE_FLAG", - "A11Y_ISIMPLEDOM_USAGE_FLAG", "APPLICATION_REPUTATION_LOCAL", "APPLICATION_REPUTATION_SERVER", "APPLICATION_REPUTATION_SHOULD_BLOCK", @@ -603,18 +601,13 @@ "FX_SESSION_RESTORE_WRITE_FILE_MS", "FX_THUMBNAILS_BG_CAPTURE_PAGE_LOAD_TIME_MS", "PLACES_BACKUPS_TOJSON_MS", - "A11Y_ISIMPLEDOM_USAGE_FLAG", "FX_SESSION_RESTORE_MANUAL_RESTORE_DURATION_UNTIL_EAGER_TABS_RESTORED_MS", "FX_SESSION_RESTORE_ALL_FILES_CORRUPT", - "A11Y_IATABLE_USAGE_FLAG", "LOCALDOMSTORAGE_PRELOAD_PENDING_ON_FIRST_ACCESS", "PAGE_FAULTS_HARD", "GEOLOCATION_WIN8_SOURCE_IS_MLS" ], "kind": [ - "A11Y_IATABLE_USAGE_FLAG", - "A11Y_INSTANTIATED_FLAG", - "A11Y_ISIMPLEDOM_USAGE_FLAG", "CANVAS_WEBGL_ACCL_FAILURE_ID", "CANVAS_WEBGL_FAILURE_ID", "COMPONENTS_SHIM_ACCESSED_BY_CONTENT",