corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge the last PGO-green inbound changeset to m-c.

Browse Source
This commit is contained in:
Ryan VanderMeulen
2012-09-20 21:23:35 -04:00
parent 404edd3acc b257e56ed3
commit 0c6a12cddb
141 changed files with 2641 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docshell/base/nsDocShell.cpp
View File

@@ -8675,15 +8675,17 @@ nsDocShell::InternalLoad(nsIURI * aURI,
sameExceptHashes && !newHash.IsEmpty());
if (doShortCircuitedLoad) {
// Cancel any outstanding loads if this is a history load.
// Cancel an outstanding new-document load if this is a history
// load.
//
// We can't cancel the oustanding load unconditionally, because if a page does
// We can't cancel the oustanding load unconditionally, because if a
// page does
// - load a.html
// - start loading b.html
// - load a.html#h
// we break the web if we cancel the load of b.html.
if (aSHEntry) {
Stop(nsIWebNavigation::STOP_NETWORK);
if (aSHEntry && mDocumentRequest) {
mDocumentRequest->Cancel(NS_BINDING_ABORTED);
}
// Save the current URI; we need it if we fire a hashchange later.