author | Tim Taubert <ttaubert@mozilla.com> |
Mon, 18 Feb 2013 19:23:50 +0100 | |
changeset 122281 | 32f30440ced7a0bfcedef76c4e0927f074f06ac1 |
parent 122280 | c398fc5f72cf0e49561f07be0e5ae4f2805c38ad |
child 122282 | e884af799de8a163fd41b327dab601ebc5dbdb86 |
push id | 24328 |
push user | ttaubert@mozilla.com |
push date | Tue, 19 Feb 2013 09:39:45 +0000 |
treeherder | mozilla-central@3f0f2fc4bd0f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | felipe |
bugs | 795939 |
milestone | 21.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
|
--- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -4728,22 +4728,26 @@ var TabsProgressListener = { aStateFlags & Ci.nsIWebProgressListener.STATE_START && aStateFlags & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT && gCrashReporter.enabled) { gCrashReporter.annotateCrashReport("URL", aRequest.URI.spec); } #endif // Collect telemetry data about tab load times. - if (aWebProgress.DOMWindow == aWebProgress.DOMWindow.top && - aStateFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW) { - if (aStateFlags & Ci.nsIWebProgressListener.STATE_START) - TelemetryStopwatch.start("FX_PAGE_LOAD_MS", aBrowser); - else if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP) - TelemetryStopwatch.finish("FX_PAGE_LOAD_MS", aBrowser); + if (aWebProgress.DOMWindow == aWebProgress.DOMWindow.top) { + if (aStateFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW) { + if (aStateFlags & Ci.nsIWebProgressListener.STATE_START) + TelemetryStopwatch.start("FX_PAGE_LOAD_MS", aBrowser); + else if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP) + TelemetryStopwatch.finish("FX_PAGE_LOAD_MS", aBrowser); + } else if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP && + aStatus == Cr.NS_BINDING_ABORTED) { + TelemetryStopwatch.cancel("FX_PAGE_LOAD_MS", aBrowser); + } } // Attach a listener to watch for "click" events bubbling up from error // pages and other similar page. This lets us fix bugs like 401575 which // require error page UI to do privileged things, without letting error // pages have any privilege themselves. // We can't look for this during onLocationChange since at that point the // document URI is not yet the about:-uri of the error page.