Bug 1130032 - Missing plugin UI is broken. r=mconley, a=sledru
authorYury Delendik <ydelendik@mozilla.com>
Fri, 06 Feb 2015 15:15:25 -0600
changeset 249674 10d1df99ba8e2ca1386cc7a555bee7ad85a25b9a
parent 249673 1e9694bbffaa4179d7163c3f42ff6b430760e0e7
child 249675 5223d6e4ab501fa24a94f05c0addeb3cbe7d800c
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, sledru
bugs1130032
milestone37.0a2
Bug 1130032 - Missing plugin UI is broken. r=mconley, a=sledru
browser/modules/PluginContent.jsm
--- a/browser/modules/PluginContent.jsm
+++ b/browser/modules/PluginContent.jsm
@@ -441,16 +441,19 @@ PluginContent.prototype = {
       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')