Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-06-25 20:29:33 +00:00
Code Issues Projects Releases Wiki Activity

#402: M1355039, tune up M1356755

Browse Source
This commit is contained in:
Cameron Kaiser 2017-05-29 20:21:49 -07:00
parent d16728f384
commit 4e9af1b2f2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docshell/base/nsDocShell.cpp
View File

@ -5323,11 +5323,16 @@ nsDocShell::Reload(uint32_t aReloadFlags)
} }
} }
rv = InternalLoad(mCurrentURI, // Stack variables to ensure changes to the member variables don't affect
// the call.
nsCOMPtr<nsIURI> currentURI = mCurrentURI;
nsCOMPtr<nsIURI> referrerURI = mReferrerURI;
uint32_t referrerPolicy = mReferrerPolicy;
rv = InternalLoad(currentURI,
originalURI, originalURI,
loadReplace, loadReplace,
mReferrerURI, referrerURI,
mReferrerPolicy, referrerPolicy,
principal, principal,
flags, flags,
nullptr, // No window target nullptr, // No window target

2
dom/base/nsGlobalWindow.cpp
View File

@ -9411,7 +9411,7 @@ void
nsGlobalWindow::SetActive(bool aActive) nsGlobalWindow::SetActive(bool aActive)
{ {
nsPIDOMWindow::SetActive(aActive); nsPIDOMWindow::SetActive(aActive);
if (mDoc) { if (MOZ_LIKELY(mDoc)) {
NotifyDocumentTree(mDoc, nullptr); NotifyDocumentTree(mDoc, nullptr);
} }
} }