Bug 830809 - Remove 'shutdown start' label with eConsiderQuit. r=ehsan
authorBenoit Girard <b56girard@gmail.com>
Wed, 16 Jan 2013 11:01:14 -0500
changeset 119120 712eca11a04ea7dc01a874fde84bdaf894e96a48
parent 119119 e279a54371b701a692614611b3266357ce56f01e
child 119121 9e6d6383957faa66d675ccfaeb96719f45f7ca67
child 119215 80b5e01132547750edc264a7ddabce54e5a3e5aa
child 127208 7c187e490f4ded18e829a33e0cb3bfe735a37e85
push id21473
push userb56girard@gmail.com
push dateThu, 17 Jan 2013 05:14:00 +0000
treeherdermozilla-inbound@712eca11a04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs830809
milestone21.0a1
first release with
nightly linux32
712eca11a04e / 21.0a1 / 20130117030933 / files
nightly linux64
712eca11a04e / 21.0a1 / 20130117030933 / files
nightly mac
712eca11a04e / 21.0a1 / 20130117030933 / files
nightly win32
712eca11a04e / 21.0a1 / 20130117030933 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 830809 - Remove 'shutdown start' label with eConsiderQuit. r=ehsan
content/svg/content/src/DOMSVGPoint.cpp
toolkit/components/startup/nsAppStartup.cpp
--- a/toolkit/components/startup/nsAppStartup.cpp
+++ b/toolkit/components/startup/nsAppStartup.cpp
@@ -304,17 +304,16 @@ nsAppStartup::Quit(uint32_t aMode)
   // Exit() method via nsAppExitEvent to allow one last pass
   // through any events in the queue. This guarantees a tidy cleanup.
   nsresult rv = NS_OK;
   bool postedExitEvent = false;
 
   if (mShuttingDown)
     return NS_OK;
 
-  SAMPLE_MARKER("Shutdown start");
   mozilla::RecordShutdownStartTimeStamp();
 
   // If we're considering quitting, we will only do so if:
   if (ferocity == eConsiderQuit) {
 #ifdef XP_MACOSX
     nsCOMPtr<nsIAppShellService> appShell
       (do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
     bool hasHiddenPrivateWindow = false;
@@ -377,16 +376,17 @@ nsAppStartup::Quit(uint32_t aMode)
           if (domWindow) {
             if (!domWindow->CanClose())
               return NS_OK;
           }
         }
       }
     }
 
+    SAMPLE_MARKER("Shutdown start");
     mShuttingDown = true;
     if (!mRestart) {
       mRestart = (aMode & eRestart) != 0;
       gRestartMode = (aMode & 0xF0);
     }
 
     if (mRestart) {
       // Firefox-restarts reuse the process. Process start-time isn't a useful indicator of startup time