From ab961aeb54335fd07c66de2e3b8c3b6af6f89ea2 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 3 Sep 2018 10:11:38 +0200 Subject: Remove all C++ Telemetry Accumulation calls. This creates a number of stubs and leaves some surrounding code that may be irrelevant (eg. recorded time stamps, status variables). Stub resolution/removal should be a follow-up to this. --- accessible/base/Statistics.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'accessible') diff --git a/accessible/base/Statistics.h b/accessible/base/Statistics.h index c9f1832b2..f5a9a85b8 100644 --- a/accessible/base/Statistics.h +++ b/accessible/base/Statistics.h @@ -14,22 +14,22 @@ namespace a11y { namespace statistics { inline void A11yInitialized() - { Telemetry::Accumulate(Telemetry::A11Y_INSTANTIATED_FLAG, true); } + { /* STUB */ } inline void A11yConsumers(uint32_t aConsumer) - { Telemetry::Accumulate(Telemetry::A11Y_CONSUMERS, aConsumer); } + { /* STUB */ } /** * Report that ISimpleDOM* has been used. */ inline void ISimpleDOMUsed() - { Telemetry::Accumulate(Telemetry::A11Y_ISIMPLEDOM_USAGE_FLAG, true); } + { /* STUB */ } /** * Report that IAccessibleTable has been used. */ inline void IAccessibleTableUsed() - { Telemetry::Accumulate(Telemetry::A11Y_IATABLE_USAGE_FLAG, true); } + { /* STUB */ } } // namespace statistics } // namespace a11y -- cgit v1.2.3 From 93cae908bcbd063f21d5663a7d3149464af2ad20 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 4 Sep 2018 09:41:24 +0200 Subject: Remove all C++ telemetry autotimers --- accessible/base/NotificationController.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'accessible') diff --git a/accessible/base/NotificationController.cpp b/accessible/base/NotificationController.cpp index 73d364641..3545ce6c1 100644 --- a/accessible/base/NotificationController.cpp +++ b/accessible/base/NotificationController.cpp @@ -591,7 +591,6 @@ void NotificationController::WillRefresh(mozilla::TimeStamp aTime) { PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER); - Telemetry::AutoTimer updateTimer; // If the document accessible that notification collector was created for is // now shut down, don't process notifications anymore. -- cgit v1.2.3 From 5335681cd2ab05ad47e81be7722c9eee19d54065 Mon Sep 17 00:00:00 2001 From: adeshkp Date: Sat, 12 Jan 2019 06:20:31 -0500 Subject: Telemetry: Remove stubs and related code --- accessible/base/Statistics.h | 39 ---------------------- accessible/base/nsAccessibilityService.cpp | 3 -- accessible/windows/ia2/ia2AccessibleTable.cpp | 2 -- accessible/windows/msaa/Compatibility.cpp | 12 ------- accessible/windows/msaa/DocAccessibleWrap.cpp | 2 -- accessible/windows/msaa/TextLeafAccessibleWrap.cpp | 2 -- 6 files changed, 60 deletions(-) delete mode 100644 accessible/base/Statistics.h (limited to 'accessible') diff --git a/accessible/base/Statistics.h b/accessible/base/Statistics.h deleted file mode 100644 index f5a9a85b8..000000000 --- a/accessible/base/Statistics.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef A11Y_STATISTICS_H_ -#define A11Y_STATISTICS_H_ - -#include "mozilla/Telemetry.h" - -namespace mozilla { -namespace a11y { -namespace statistics { - - inline void A11yInitialized() - { /* STUB */ } - - inline void A11yConsumers(uint32_t aConsumer) - { /* STUB */ } - - /** - * Report that ISimpleDOM* has been used. - */ - inline void ISimpleDOMUsed() - { /* STUB */ } - - /** - * Report that IAccessibleTable has been used. - */ - inline void IAccessibleTableUsed() - { /* STUB */ } - -} // namespace statistics -} // namespace a11y -} // namespace mozilla - -#endif - diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp index 46d4dde01..90d54e3ab 100644 --- a/accessible/base/nsAccessibilityService.cpp +++ b/accessible/base/nsAccessibilityService.cpp @@ -32,7 +32,6 @@ #include "RootAccessibleWrap.h" #endif #include "States.h" -#include "Statistics.h" #include "TextLeafAccessibleWrap.h" #include "TreeWalker.h" #include "xpcAccessibleApplication.h" @@ -1288,8 +1287,6 @@ nsAccessibilityService::Init() if (XRE_IsParentProcess()) PlatformInit(); - statistics::A11yInitialized(); - return true; } diff --git a/accessible/windows/ia2/ia2AccessibleTable.cpp b/accessible/windows/ia2/ia2AccessibleTable.cpp index a99f72def..cf0c0f3e2 100644 --- a/accessible/windows/ia2/ia2AccessibleTable.cpp +++ b/accessible/windows/ia2/ia2AccessibleTable.cpp @@ -13,7 +13,6 @@ #include "AccessibleWrap.h" #include "IUnknownImpl.h" -#include "Statistics.h" #include "TableAccessible.h" #include "nsCOMPtr.h" @@ -32,7 +31,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/Compatibility.cpp b/accessible/windows/msaa/Compatibility.cpp index 31026c586..9500e875d 100644 --- a/accessible/windows/msaa/Compatibility.cpp +++ b/accessible/windows/msaa/Compatibility.cpp @@ -7,7 +7,6 @@ #include "Compatibility.h" #include "nsWinUtils.h" -#include "Statistics.h" #include "mozilla/Preferences.h" @@ -52,8 +51,6 @@ uint32_t Compatibility::sConsumers = Compatibility::UNKNOWN; void Compatibility::Init() { - // Note we collect some AT statistics/telemetry here for convenience. - HMODULE jawsHandle = ::GetModuleHandleW(L"jhook"); if (jawsHandle) sConsumers |= (IsModuleVersionLessThan(jawsHandle, 8, 2173)) ? @@ -92,15 +89,6 @@ Compatibility::Init() if (sConsumers != Compatibility::UNKNOWN) sConsumers ^= Compatibility::UNKNOWN; - // Gather telemetry - uint32_t temp = sConsumers; - for (int i = 0; temp; i++) { - if (temp & 0x1) - statistics::A11yConsumers(i); - - temp >>= 1; - } - // Turn off new tab switching for Jaws and WE. if (sConsumers & (JAWS | OLDJAWS | WE)) { // Check to see if the pref for disallowing CtrlTab is already set. If so, diff --git a/accessible/windows/msaa/DocAccessibleWrap.cpp b/accessible/windows/msaa/DocAccessibleWrap.cpp index 895fe9192..1ef989cff 100644 --- a/accessible/windows/msaa/DocAccessibleWrap.cpp +++ b/accessible/windows/msaa/DocAccessibleWrap.cpp @@ -12,7 +12,6 @@ #include "Role.h" #include "RootAccessible.h" #include "sdnDocAccessible.h" -#include "Statistics.h" #include "nsIDocShell.h" #include "nsIInterfaceRequestorUtils.h" @@ -36,7 +35,6 @@ DocAccessibleWrap::~DocAccessibleWrap() IMPL_IUNKNOWN_QUERY_HEAD(DocAccessibleWrap) if (aIID == IID_ISimpleDOMDocument) { - statistics::ISimpleDOMUsed(); *aInstancePtr = static_cast(new sdnDocAccessible(this)); static_cast(*aInstancePtr)->AddRef(); return S_OK; diff --git a/accessible/windows/msaa/TextLeafAccessibleWrap.cpp b/accessible/windows/msaa/TextLeafAccessibleWrap.cpp index 6f1d193db..36126cb7a 100644 --- a/accessible/windows/msaa/TextLeafAccessibleWrap.cpp +++ b/accessible/windows/msaa/TextLeafAccessibleWrap.cpp @@ -7,13 +7,11 @@ #include "TextLeafAccessibleWrap.h" #include "sdnTextAccessible.h" -#include "Statistics.h" using namespace mozilla::a11y; IMPL_IUNKNOWN_QUERY_HEAD(TextLeafAccessibleWrap) if (aIID == IID_ISimpleDOMText) { - statistics::ISimpleDOMUsed(); *aInstancePtr = static_cast(new sdnTextAccessible(this)); static_cast(*aInstancePtr)->AddRef(); return S_OK; -- cgit v1.2.3 From 25779d371c571e4f51792af3e3c5588b3186e934 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 30 Mar 2019 19:10:17 +0100 Subject: Issue #187: Remove solaris conditional code. --- accessible/tests/mochitest/common.js | 1 - accessible/tests/mochitest/elm/test_nsApplicationAcc.html | 2 +- accessible/tests/mochitest/treeupdate/test_contextmenu.xul | 6 +++--- accessible/tests/mochitest/treeupdate/test_menu.xul | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'accessible') diff --git a/accessible/tests/mochitest/common.js b/accessible/tests/mochitest/common.js index 1e48fa067..b3f83ea84 100644 --- a/accessible/tests/mochitest/common.js +++ b/accessible/tests/mochitest/common.js @@ -59,7 +59,6 @@ const nsIPropertyElement = Components.interfaces.nsIPropertyElement; const MAC = (navigator.platform.indexOf("Mac") != -1); const LINUX = (navigator.platform.indexOf("Linux") != -1); -const SOLARIS = (navigator.platform.indexOf("SunOS") != -1); const WIN = (navigator.platform.indexOf("Win") != -1); //////////////////////////////////////////////////////////////////////////////// diff --git a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html index 58763e437..e23eb37bc 100644 --- a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html +++ b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html @@ -32,7 +32,7 @@ // nsIAccessible::name var applicationName = ""; - if (LINUX || SOLARIS) { + if (LINUX) { applicationName = appInfo.name; } else { try { diff --git a/accessible/tests/mochitest/treeupdate/test_contextmenu.xul b/accessible/tests/mochitest/treeupdate/test_contextmenu.xul index 5b31e0136..916b815eb 100644 --- a/accessible/tests/mochitest/treeupdate/test_contextmenu.xul +++ b/accessible/tests/mochitest/treeupdate/test_contextmenu.xul @@ -130,7 +130,7 @@ */ function getMenuTree1() { - if (LINUX || SOLARIS) { + if (LINUX) { var tree = { role: ROLE_MENUPOPUP, children: [ @@ -190,7 +190,7 @@ function getMenuTree2() { var tree = getMenuTree1(); - if (LINUX || SOLARIS) { + if (LINUX) { var submenuTree = { name: "item2.0", @@ -232,7 +232,7 @@ children: [] }; - if (LINUX || SOLARIS) + if (LINUX) tree.children[2].children[0].children.push(subsubmenuTree); else tree.children[2].children[0].children[0].children[0].children.push(subsubmenuTree); diff --git a/accessible/tests/mochitest/treeupdate/test_menu.xul b/accessible/tests/mochitest/treeupdate/test_menu.xul index abdea217e..d62ac8c5d 100644 --- a/accessible/tests/mochitest/treeupdate/test_menu.xul +++ b/accessible/tests/mochitest/treeupdate/test_menu.xul @@ -32,7 +32,7 @@ this.invoke = function openMenu_invoke() { var tree; - if (LINUX || SOLARIS) { + if (LINUX) { tree = { PARENT_MENUITEM: [ ] }; @@ -51,7 +51,7 @@ this.finalCheck = function openMenu_finalCheck() { var tree; - if (LINUX || SOLARIS) { + if (LINUX) { tree = { PARENT_MENUITEM: [ { MENUITEM: [ ] }, -- cgit v1.2.3 From 5d409fdca92e085dad2f9c80b42f33afe4f10800 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 31 Mar 2019 18:43:10 +0200 Subject: Remove AIX 1st party code OS checks, part 1 Issue #186 --- accessible/atk/Platform.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'accessible') diff --git a/accessible/atk/Platform.cpp b/accessible/atk/Platform.cpp index e64084f5a..0ee3a3d97 100644 --- a/accessible/atk/Platform.cpp +++ b/accessible/atk/Platform.cpp @@ -60,11 +60,7 @@ struct GnomeAccessibilityModule }; static GnomeAccessibilityModule sAtkBridge = { -#ifdef AIX - "libatk-bridge.a(libatk-bridge.so.0)", nullptr, -#else "libatk-bridge.so", nullptr, -#endif "gnome_accessibility_module_init", nullptr, "gnome_accessibility_module_shutdown", nullptr }; -- cgit v1.2.3