Bug 710562. (Av1a) Disable 2 application-specific '#ifdef' in Toolkit, as a workaround ftb. r=taras.
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 06 Jan 2012 17:36:27 +0100
changeset 85121 75ead35a1230f305804cae6da16f91d190e7cd2c
parent 85120 7564c427cd9846de2243f546a5f01a9bc0565106
child 85122 57a33c9f08b118e9b4b7e715c6519df597eb6204
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstaras
bugs710562
milestone12.0a1
Bug 710562. (Av1a) Disable 2 application-specific '#ifdef' in Toolkit, as a workaround ftb. r=taras.
toolkit/components/telemetry/TelemetryHistograms.h
--- a/toolkit/components/telemetry/TelemetryHistograms.h
+++ b/toolkit/components/telemetry/TelemetryHistograms.h
@@ -284,30 +284,34 @@ HISTOGRAM(PLACES_AUTOCOMPLETE_1ST_RESULT
 /**
  * Updater telemetry.
  */
 HISTOGRAM(UPDATE_STATUS, 1, 16006, 20, LINEAR, "Updater: the status of the latest update performed")
 
 /**
  * Thunderbird-specific telemetry.
  */
-#ifdef MOZ_THUNDERBIRD
+// Disable this application-specific #ifdef ftb. (See bug 710562)
+// #ifdef MOZ_THUNDERBIRD
 HISTOGRAM(THUNDERBIRD_GLODA_SIZE_MB, 1, 1000, 40, LINEAR, "Gloda: size of global-messages-db.sqlite (MB)")
+// THUNDERBIRD_CONVERSATIONS_TIME_TO_2ND_GLODA_QUERY_MS is used by Thunderbird Conversations add-on.
+// https://addons.mozilla.org/en-US/thunderbird/addon/54035/
 HISTOGRAM(THUNDERBIRD_CONVERSATIONS_TIME_TO_2ND_GLODA_QUERY_MS, 1, 10000, 30, EXPONENTIAL, "Conversations: time between the moment we click and the second gloda query returns (ms)")
 HISTOGRAM(THUNDERBIRD_INDEXING_RATE_MSG_PER_S, 1, 100, 20, LINEAR, "Gloda: indexing rate (message/s)")
-#endif
+// #endif
 
 /**
  * Firefox-specific telemetry.
  */
-#ifdef MOZ_PHOENIX
+// Disable this application-specific #ifdef ftb. (See bug 710562)
+// #ifdef MOZ_PHOENIX
 HISTOGRAM(FX_TAB_ANIM_OPEN_MS, 1, 3000, 10, EXPONENTIAL, "Firefox: Time taken by the tab opening animation")
 HISTOGRAM(FX_TAB_ANIM_CLOSE_MS, 1, 3000, 10, EXPONENTIAL, "Firefox: Time taken by the tab closing animation")
 HISTOGRAM_BOOLEAN(FX_CONTEXT_SEARCH_AND_TAB_SELECT, "Firefox: Background tab was selected within 5 seconds of searching from the context menu")
-#endif
+// #endif
 
 HISTOGRAM_BOOLEAN(INNERWINDOWS_WITH_MUTATION_LISTENERS, "Deleted or to-be-reused innerwindow which has had mutation event listeners.")
 HISTOGRAM(XUL_REFLOW_MS, 1, 3000, 10, EXPONENTIAL, "xul reflows")
 HISTOGRAM(XUL_INITIAL_FRAME_CONSTRUCTION, 1, 3000, 10, EXPONENTIAL, "initial xul frame construction")
 HISTOGRAM_BOOLEAN(XMLHTTPREQUEST_ASYNC_OR_SYNC, "Type of XMLHttpRequest, async or sync")
 
 /**
  * DOM Storage telemetry.