Allow certain restricted loads in unload events. Bug 409888, r+sr=jst

git-svn-id: svn://10.0.0.236/trunk@243999 18797224-902f-48f8-a5cc-f745e15eee43
2008-01-25 20:31:44 +00:00
parent 2c0808c1ca
commit 5982fb6110
3 changed files with 129 additions and 9 deletions
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -766,7 +766,7 @@ nsWebShell::OnLinkClick(nsIContent* aContent,
 {
  NS_ASSERTION(NS_IsMainThread(), "wrong thread");

-  if (mFiredUnloadEvent) {
+  if (!IsOKToLoadURI(aURI)) {
    return NS_OK;
  }

@@ -797,7 +797,7 @@ nsWebShell::OnLinkClickSync(nsIContent *aContent,
    *aRequest = nsnull;
  }

-  if (mFiredUnloadEvent) {
+  if (!IsOKToLoadURI(aURI)) {
    return NS_OK;
  }