From 52c8cecb5feff2b040d840e27246138b7448fc5a Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 4 Nov 2013 12:55:56 -0500
Subject: [PATCH] Backed out changesets f488602d26c9 and 09725c69fd76 (bug
 860493) for OSX bustage. CLOSED TREE

---
 browser/app/profile/firefox.js                |  4 --
 .../base/content/browser-gestureSupport.js    | 46 +++++++------------
 toolkit/components/telemetry/Histograms.json  | 12 -----
 3 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index ce7acba7246..c93687ce8db 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -588,11 +588,7 @@ pref("browser.gesture.twist.left", "cmd_gestureRotateLeft");
 pref("browser.gesture.twist.end", "cmd_gestureRotateEnd");
 pref("browser.gesture.tap", "cmd_fullZoomReset");
 
-#ifndef RELEASE_BUILD
-pref("browser.snapshots.limit", 5);
-#else
 pref("browser.snapshots.limit", 0);
-#endif
 
 // 0: Nothing happens
 // 1: Scrolling contents
diff --git a/browser/base/content/browser-gestureSupport.js b/browser/base/content/browser-gestureSupport.js
index f8e80390953..d75ddb77aea 100644
--- a/browser/base/content/browser-gestureSupport.js
+++ b/browser/base/content/browser-gestureSupport.js
@@ -2,8 +2,6 @@
 # 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/.
 
-Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", this);
-
 // Simple gestures support
 //
 // As per bug #412486, web content must not be allowed to receive any
@@ -943,34 +941,24 @@ let gHistorySwipeAnimation = {
         (gBrowser.webNavigation.sessionHistory.index < 0))
       return;
 
-    TelemetryStopwatch.start("FX_GESTURE_TAKE_SNAPSHOT_OF_PAGE");
-    try {
-      let browser = gBrowser.selectedBrowser;
-      let r = browser.getBoundingClientRect();
-      let canvas = document.createElementNS("http://www.w3.org/1999/xhtml",
-                                            "canvas");
-      canvas.mozOpaque = true;
-      canvas.width = r.width;
-      canvas.height = r.height;
-      let ctx = canvas.getContext("2d");
-      let zoom = browser.markupDocumentViewer.fullZoom;
-      ctx.scale(zoom, zoom);
-      ctx.drawWindow(browser.contentWindow,
-                     0, 0, r.width / zoom, r.height / zoom, "white",
-                     ctx.DRAWWINDOW_DO_NOT_FLUSH | ctx.DRAWWINDOW_DRAW_VIEW |
-                     ctx.DRAWWINDOW_ASYNC_DECODE_IMAGES |
-                     ctx.DRAWWINDOW_USE_WIDGET_LAYERS);
-    } finally {
-      TelemetryStopwatch.stop("FX_GESTURE_TAKE_SNAPSHOT_OF_PAGE");
-    }
+    let browser = gBrowser.selectedBrowser;
+    let r = browser.getBoundingClientRect();
+    let canvas = document.createElementNS("http://www.w3.org/1999/xhtml",
+                                          "canvas");
+    canvas.mozOpaque = true;
+    canvas.width = r.width;
+    canvas.height = r.height;
+    let ctx = canvas.getContext("2d");
+    let zoom = browser.markupDocumentViewer.fullZoom;
+    ctx.scale(zoom, zoom);
+    ctx.drawWindow(browser.contentWindow,
+                   0, 0, r.width / zoom, r.height / zoom, "white",
+                   ctx.DRAWWINDOW_DO_NOT_FLUSH | ctx.DRAWWINDOW_DRAW_VIEW |
+                   ctx.DRAWWINDOW_ASYNC_DECODE_IMAGES |
+                   ctx.DRAWWINDOW_USE_WIDGET_LAYERS);
 
-    TelemetryStopwatch.start("FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE");
-    try {
-      this._installCurrentPageSnapshot(canvas);
-      this._assignSnapshotToCurrentBrowser(canvas);
-    } finally {
-      TelemetryStopwatch.stop("FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE");
-    }
+    this._installCurrentPageSnapshot(canvas);
+    this._assignSnapshotToCurrentBrowser(canvas);
   },
 
   /**
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index a48966cc61f..13a3546d377 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -2627,18 +2627,6 @@
     "n_buckets": 20,
     "description": "Gloda: indexing rate (message/s)"
   },
-  "FX_GESTURE_TAKE_SNAPSHOT_OF_PAGE": {
-    "kind": "exponential",
-    "high": "1000",
-    "n_buckets": "30",
-    "description": "Firefox: Time taken to capture the page to a canvas, for reuse while swiping through history (ms)."
-  },
-  "FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE": {
-    "kind": "exponential",
-    "high": "1000",
-    "n_buckets": "30",
-    "description": "Firefox: Time taken to store the image capture of the page to a canvas, for reuse while swiping through history (ms)."
-  },
   "FX_TAB_ANIM_OPEN_MS": {
     "kind": "exponential",
     "high": "3000",