Backed out changeset c083d7a68fd2 due to missing Australis in commit message.
authorMike Conley <mconley@mozilla.com>
Tue, 10 Dec 2013 18:44:51 -0500
changeset 159729 564dc76ddc094a254a510a39cfb2d4fdbbda05da
parent 159728 3f3caad81fec93c59e6993dec637eda906b34bb1
child 159730 860f0ad9bb33101afc0def97668604ecc3d00912
push id3902
push usermconley@mozilla.com
push dateTue, 10 Dec 2013 23:47:23 +0000
treeherderfx-team@371cd4b623de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone29.0a1
backs outc083d7a68fd251ad431d79f87bb6a6d9cb1bc43d
Backed out changeset c083d7a68fd2 due to missing Australis in commit message.
browser/modules/BrowserUITelemetry.jsm
--- a/browser/modules/BrowserUITelemetry.jsm
+++ b/browser/modules/BrowserUITelemetry.jsm
@@ -81,19 +81,19 @@ this.BrowserUITelemetry = {
       }
       parent = current;
       current = current[key];
     }
     return parent;
   },
 
   _countableEvents: {},
-  _countMouseUpEvent: function(aCategory, aAction, aButton) {
+  _countMouseUpEvent: function(aCategory, aAction, aMouseUpEvent) {
     const BUTTONS = ["left", "middle", "right"];
-    let buttonKey = BUTTONS[aButton];
+    let buttonKey = BUTTONS[aMouseUpEvent.button];
     if (buttonKey) {
       let countObject =
         this._ensureObjectChain([aCategory, aAction, buttonKey], 0);
       countObject[buttonKey]++;
     }
   },
 
   _registerWindow: function(aWindow) {
@@ -129,17 +129,17 @@ this.BrowserUITelemetry = {
 
   _handleMouseUp: function(aEvent) {
     let item = aEvent.originalTarget;
     // Perhaps we're seeing one of the default toolbar items
     // being clicked.
     if (ALL_BUILTIN_ITEMS.indexOf(item.id) != -1) {
       // Base case - we clicked directly on one of our built-in items,
       // and we can go ahead and register that click.
-      this._countMouseUpEvent("click-builtin-item", item.id, aEvent.button);
+      this._countMouseUpEvent("click-builtin-item", item.id, aEvent);
     }
   },
 
   getToolbarMeasures: function() {
     // Grab the most recent non-popup, non-private browser window for us to
     // analyze the toolbars in...
     let win = RecentWindow.getMostRecentBrowserWindow({
       private: false,