summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/ContentCrashHandlers.jsm18
-rw-r--r--modules/ContentLinkHandler.jsm36
-rw-r--r--modules/PermissionUI.jsm4
-rw-r--r--modules/PluginContent.jsm52
-rw-r--r--modules/ProcessHangMonitor.jsm11
5 files changed, 1 insertions, 120 deletions
diff --git a/modules/ContentCrashHandlers.jsm b/modules/ContentCrashHandlers.jsm
index 488cc4f..459ff41 100644
--- a/modules/ContentCrashHandlers.jsm
+++ b/modules/ContentCrashHandlers.jsm
@@ -86,12 +86,6 @@ this.TabCrashHandler = {
let childID = aSubject.get("childID");
let dumpID = aSubject.get("dumpID");
- if (!dumpID) {
- Services.telemetry
- .getHistogramById("FX_CONTENT_CRASH_DUMP_UNAVAILABLE")
- .add(1);
- }
-
if (!this.flushCrashedBrowserQueue(childID)) {
this.unseenCrashedChildIDs.push(childID);
// The elements in unseenCrashedChildIDs will only be removed if
@@ -375,12 +369,6 @@ this.TabCrashHandler = {
data.email = this.prefs.getCharPref("email", "");
}
- // Make sure to only count once even if there are multiple windows
- // that will all show about:tabcrashed.
- if (this._crashedTabCount == 1) {
- Services.telemetry.getHistogramById("FX_CONTENT_CRASH_PRESENTED").add(1);
- }
-
message.target.sendAsyncMessage("SetCrashReportAvailable", data);
},
@@ -401,12 +389,6 @@ this.TabCrashHandler = {
let browser = message.target.browser;
let childID = this.browserMap.get(browser.permanentKey);
-
- // Make sure to only count once even if there are multiple windows
- // that will all show about:tabcrashed.
- if (this._crashedTabCount == 0 && childID) {
- Services.telemetry.getHistogramById("FX_CONTENT_CRASH_NOT_SUBMITTED").add(1);
- }
},
/**
diff --git a/modules/ContentLinkHandler.jsm b/modules/ContentLinkHandler.jsm
index 443cae2..76822e8 100644
--- a/modules/ContentLinkHandler.jsm
+++ b/modules/ContentLinkHandler.jsm
@@ -19,13 +19,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Feeds",
XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
-const SIZES_TELEMETRY_ENUM = {
- NO_SIZES: 0,
- ANY: 1,
- DIMENSION: 2,
- INVALID: 3,
-};
-
this.ContentLinkHandler = {
init: function(chromeGlobal) {
chromeGlobal.addEventListener("DOMLinkAdded", (event) => {
@@ -79,35 +72,6 @@ this.ContentLinkHandler = {
if (!uri)
break;
- // Telemetry probes for measuring the sizes attribute
- // usage and available dimensions.
- let sizeHistogramTypes = Services.telemetry.
- getHistogramById("LINK_ICON_SIZES_ATTR_USAGE");
- let sizeHistogramDimension = Services.telemetry.
- getHistogramById("LINK_ICON_SIZES_ATTR_DIMENSION");
- let sizesType;
- if (link.sizes.length) {
- for (let size of link.sizes) {
- if (size.toLowerCase() == "any") {
- sizesType = SIZES_TELEMETRY_ENUM.ANY;
- break;
- } else {
- let re = /^([1-9][0-9]*)x[1-9][0-9]*$/i;
- let values = re.exec(size);
- if (values && values.length > 1) {
- sizesType = SIZES_TELEMETRY_ENUM.DIMENSION;
- sizeHistogramDimension.add(parseInt(values[1]));
- } else {
- sizesType = SIZES_TELEMETRY_ENUM.INVALID;
- break;
- }
- }
- }
- } else {
- sizesType = SIZES_TELEMETRY_ENUM.NO_SIZES;
- }
- sizeHistogramTypes.add(sizesType);
-
chromeGlobal.sendAsyncMessage(
"Link:SetIcon",
{url: uri.spec, loadingPrincipal: link.ownerDocument.nodePrincipal});
diff --git a/modules/PermissionUI.jsm b/modules/PermissionUI.jsm
index ffae095..aea512b 100644
--- a/modules/PermissionUI.jsm
+++ b/modules/PermissionUI.jsm
@@ -234,9 +234,7 @@ this.PermissionPromptPrototype = {
/**
* If the prompt will be shown to the user, this callback will
- * be called just before. Subclasses may want to override this
- * in order to, for example, bump a counter Telemetry probe for
- * how often a particular permission request is seen.
+ * be called just before. Subclasses may want to override this.
*/
onBeforeShow() {},
diff --git a/modules/PluginContent.jsm b/modules/PluginContent.jsm
index 622d608..f9f4b0e 100644
--- a/modules/PluginContent.jsm
+++ b/modules/PluginContent.jsm
@@ -167,7 +167,6 @@ PluginContent.prototype = {
return;
}
- this._finishRecordingFlashPluginTelemetry();
this.clearPluginCaches();
this.haveShownNotification = false;
},
@@ -533,19 +532,11 @@ PluginContent.prototype = {
case "PluginInstantiated":
let key = this._getPluginInfo(plugin).pluginTag.niceName;
- Services.telemetry.getKeyedHistogramById('PLUGIN_ACTIVATION_COUNT').add(key);
shouldShowNotification = true;
let pluginRect = plugin.getBoundingClientRect();
- if (pluginRect.width <= 5 && pluginRect.height <= 5) {
- Services.telemetry.getHistogramById('PLUGIN_TINY_CONTENT').add(1);
- }
break;
}
- if (this._getPluginInfo(plugin).mimetype === FLASH_MIME_TYPE) {
- this._recordFlashPluginTelemetry(eventType, plugin);
- }
-
// Show the in-content UI if it's not too big. The crashed plugin handler already did this.
let overlay = this.getPluginUI(plugin, "main");
if (eventType != "PluginCrashed") {
@@ -577,49 +568,6 @@ PluginContent.prototype = {
}
},
- _recordFlashPluginTelemetry: function (eventType, plugin) {
- if (!Services.telemetry.canRecordExtended) {
- return;
- }
-
- if (!this.flashPluginStats) {
- this.flashPluginStats = {
- instancesCount: 0,
- plugins: new WeakSet()
- };
- }
-
- if (!this.flashPluginStats.plugins.has(plugin)) {
- // Reporting plugin instance and its dimensions only once.
- this.flashPluginStats.plugins.add(plugin);
-
- this.flashPluginStats.instancesCount++;
-
- let pluginRect = plugin.getBoundingClientRect();
- Services.telemetry.getHistogramById('FLASH_PLUGIN_WIDTH')
- .add(pluginRect.width);
- Services.telemetry.getHistogramById('FLASH_PLUGIN_HEIGHT')
- .add(pluginRect.height);
- Services.telemetry.getHistogramById('FLASH_PLUGIN_AREA')
- .add(pluginRect.width * pluginRect.height);
-
- let state = this._getPluginInfo(plugin).fallbackType;
- if (state === null) {
- state = Ci.nsIObjectLoadingContent.PLUGIN_UNSUPPORTED;
- }
- Services.telemetry.getHistogramById('FLASH_PLUGIN_STATES')
- .add(state);
- }
- },
-
- _finishRecordingFlashPluginTelemetry: function () {
- if (this.flashPluginStats) {
- Services.telemetry.getHistogramById('FLASH_PLUGIN_INSTANCES_ON_PAGE')
- .add(this.flashPluginStats.instancesCount);
- delete this.flashPluginStats;
- }
- },
-
isKnownPlugin: function (objLoadingContent) {
return (objLoadingContent.getContentTypeForMIMEType(objLoadingContent.actualType) ==
Ci.nsIObjectLoadingContent.TYPE_PLUGIN);
diff --git a/modules/ProcessHangMonitor.jsm b/modules/ProcessHangMonitor.jsm
index 474c7c0..526fcd2 100644
--- a/modules/ProcessHangMonitor.jsm
+++ b/modules/ProcessHangMonitor.jsm
@@ -364,17 +364,6 @@ var ProcessHangMonitor = {
return;
}
- // On e10s this counts slow-script/hanged-plugin notice only once.
- // This code is not reached on non-e10s.
- if (report.hangType == report.SLOW_SCRIPT) {
- // On non-e10s, SLOW_SCRIPT_NOTICE_COUNT is probed at nsGlobalWindow.cpp
- Services.telemetry.getHistogramById("SLOW_SCRIPT_NOTICE_COUNT").add();
- } else if (report.hangType == report.PLUGIN_HANG) {
- // On non-e10s we have sufficient plugin telemetry probes,
- // so PLUGIN_HANG_NOTICE_COUNT is only probed on e10s.
- Services.telemetry.getHistogramById("PLUGIN_HANG_NOTICE_COUNT").add();
- }
-
this._activeReports.add(report);
this.updateWindows();
},
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-02 03:45:50 +0000