Commit 7a6b22b9 authored by Benjamin Smedberg's avatar Benjamin Smedberg
Browse files

Bug 1345905 - remove FLASH_PLUGIN_* telemetry, r=felipe 

MozReview-Commit-ID: CgIvYJKLIHm

--HG--
extra : rebase_source : 5602900b0906b8379dae639fb0a1285f0b15a7f7
parent 3535802d

browser/modules/PluginContent.jsm

+0 −48
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ PluginContent.prototype = { 
      return;

    }



    this._finishRecordingFlashPluginTelemetry();

    this.clearPluginCaches();

    this.haveShownNotification = false;

  },
@@ -548,10 +547,6 @@ PluginContent.prototype = { 
        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") {
@@ -583,49 +578,6 @@ PluginContent.prototype = { 
    }

  },



  _recordFlashPluginTelemetry(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() {

    if (this.flashPluginStats) {

      Services.telemetry.getHistogramById("FLASH_PLUGIN_INSTANCES_ON_PAGE")

                        .add(this.flashPluginStats.instancesCount);

    delete this.flashPluginStats;

    }

  },



  isKnownPlugin(objLoadingContent) {

    return (objLoadingContent.getContentTypeForMIMEType(objLoadingContent.actualType) ==

            Ci.nsIObjectLoadingContent.TYPE_PLUGIN);

toolkit/components/telemetry/Histograms.json

+0 −36
Original line number Diff line number Diff line
@@ -3816,42 +3816,6 @@ 
    "n_buckets": 20,

    "description": "Time spent shutting down plugins (ms)"

  },

  "FLASH_PLUGIN_STATES": {

    "expires_in_version": "50",

    "kind": "enumerated",

    "n_values": 20,

    "description": "A flash object's initialization state"

  },

  "FLASH_PLUGIN_AREA": {

    "expires_in_version": "50",

    "kind": "exponential",

    "low": 256,

    "high": 16777216,

    "n_buckets": 50,

    "description": "Flash object area (width * height)"

  },

  "FLASH_PLUGIN_WIDTH": {

    "expires_in_version": "50",

    "kind": "linear",

    "low": 1,

    "high": 2000,

    "n_buckets": 50,

    "description": "Flash object width"

  },

  "FLASH_PLUGIN_HEIGHT": {

    "expires_in_version": "50",

    "kind": "linear",

    "low": 1,

    "high": 2000,

    "n_buckets": 50,

    "description": "Flash object height"

  },

  "FLASH_PLUGIN_INSTANCES_ON_PAGE": {

    "expires_in_version": "50",

    "kind": "enumerated",

    "n_values": 30,

    "description": "Flash object instances count on page"

  },

  "MOZ_SQLITE_OPEN_MS": {

    "expires_in_version": "default",

    "kind": "exponential",

toolkit/components/telemetry/histogram-whitelists.json

+0 −10
Original line number Diff line number Diff line
@@ -247,11 +247,6 @@ 
    "FENNEC_TOPSITES_LOADER_TIME_MS",

    "FENNEC_WAS_KILLED",

    "FETCH_IS_MAINTHREAD",

    "FLASH_PLUGIN_AREA",

    "FLASH_PLUGIN_HEIGHT",

    "FLASH_PLUGIN_INSTANCES_ON_PAGE",

    "FLASH_PLUGIN_STATES",

    "FLASH_PLUGIN_WIDTH",

    "FONTLIST_INITFACENAMELISTS",

    "FONTLIST_INITOTHERFAMILYNAMES",

    "FONT_CACHE_HIT",
@@ -957,11 +952,6 @@ 
    "FENNEC_WAS_KILLED",

    "FETCH_IS_MAINTHREAD",

    "FIND_PLUGINS",

    "FLASH_PLUGIN_AREA",

    "FLASH_PLUGIN_HEIGHT",

    "FLASH_PLUGIN_INSTANCES_ON_PAGE",

    "FLASH_PLUGIN_STATES",

    "FLASH_PLUGIN_WIDTH",

    "FONTLIST_INITFACENAMELISTS",

    "FONTLIST_INITOTHERFAMILYNAMES",

    "FONT_CACHE_HIT",