Bug 1346161 - Remove HANDLE_UNLOAD_MS and HANDLE_BEFOREUNLOAD_MS telemetry probes. r=smaug
authorKan-Ru Chen <kanru@kanru.info>
Fri, 10 Mar 2017 18:35:48 +0800
changeset 397736 01b87437cefe3fc90ffffdf2ba6a89c39987ea60
parent 397735 3a2b595587f883dbbd55cb9b6437e30cc311c610
child 397737 0fa3d7b36a7b32cdabd92e14a073b2bfbe8f0e3d
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1346161
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1346161 - Remove HANDLE_UNLOAD_MS and HANDLE_BEFOREUNLOAD_MS telemetry probes. r=smaug MozReview-Commit-ID: 91WAGDKAAMu
layout/base/nsDocumentViewer.cpp
toolkit/components/telemetry/Histograms.json
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1182,21 +1182,18 @@ nsDocumentViewer::PermitUnloadInternal(b
     // Never permit dialogs from the beforeunload handler
     nsGlobalWindow* globalWindow = nsGlobalWindow::Cast(window);
     dialogsAreEnabled = globalWindow->AreDialogsEnabled();
     nsGlobalWindow::TemporarilyDisableDialogs disableDialogs(globalWindow);
 
     nsIDocument::PageUnloadingEventTimeStamp timestamp(mDocument);
 
     mInPermitUnload = true;
-    {
-      Telemetry::AutoTimer<Telemetry::HANDLE_BEFOREUNLOAD_MS> telemetryTimer;
-      EventDispatcher::DispatchDOMEvent(window, nullptr, event, mPresContext,
-                                        nullptr);
-    }
+    EventDispatcher::DispatchDOMEvent(window, nullptr, event, mPresContext,
+                                      nullptr);
     mInPermitUnload = false;
   }
 
   nsCOMPtr<nsIDocShell> docShell(mContainer);
   nsAutoString text;
   beforeUnload->GetReturnValue(text);
 
   // NB: we nullcheck mDocument because it might now be dead as a result of
@@ -1373,20 +1370,17 @@ nsDocumentViewer::PageHide(bool aIsUnloa
     event.mTarget = mDocument;
 
     // Never permit popups from the unload handler, no matter how we get
     // here.
     nsAutoPopupStatePusher popupStatePusher(openAbused, true);
 
     nsIDocument::PageUnloadingEventTimeStamp timestamp(mDocument);
 
-    {
-      Telemetry::AutoTimer<Telemetry::HANDLE_UNLOAD_MS> telemetryTimer;
-      EventDispatcher::Dispatch(window, mPresContext, &event, nullptr, &status);
-    }
+    EventDispatcher::Dispatch(window, mPresContext, &event, nullptr, &status);
   }
 
 #ifdef MOZ_XUL
   // look for open menupopups and close them after the unload event, in case
   // the unload event listeners open any new popups
   nsContentUtils::HidePopupsInDocument(mDocument);
 #endif
 
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -10907,34 +10907,16 @@
     "bug_numbers": [1308030],
     "releaseChannelCollection": "opt-out",
     "expires_in_version": "56",
     "kind": "linear",
     "high": 300000,
     "n_buckets": 30,
     "description": "Time in MS that content is narrated in 10 second increments up to 5 minutes"
   },
-  "HANDLE_UNLOAD_MS": {
-    "alert_emails": ["kchen@mozilla.com"],
-    "expires_in_version": "55",
-    "kind": "exponential",
-    "high": 10000,
-    "n_buckets": 50,
-    "bug_numbers": [1301346],
-    "description": "The time spent handling unload event in milliseconds. It measures all documents and subframes separately. If there are multiple handlers for the unload event in a document, this will record a single value across all handlers in the document."
-  },
-  "HANDLE_BEFOREUNLOAD_MS": {
-    "alert_emails": ["kchen@mozilla.com"],
-    "expires_in_version": "55",
-    "kind": "exponential",
-    "high": 10000,
-    "n_buckets": 50,
-    "bug_numbers": [1301346],
-    "description": "The time spent handling beforeunload event in milliseconds. It measures all documents and subframes separately. If there are multiple handlers for the unload event in a document, this will record a single value across all handlers in the document."
-  },
   "TABCHILD_PAINT_TIME": {
     "alert_emails": ["mconley@mozilla.com"],
     "bug_numbers": [1313686],
     "expires_in_version": "56",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 50,
     "description": "Time spent painting the contents of a remote browser (ms).",