From 5b5db164211a1685fa4a635704e37e7e99c52fd2 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Mon, 10 Dec 2012 21:52:01 +0200
Subject: [PATCH] Backout Bug 818559 to fix Bug 820067, a=me

---
 browser/base/content/test/browser_bug676619.js |  3 +--
 browser/base/content/test/download_page.html   |  5 -----
 docshell/base/nsDocShell.cpp                   |  7 +++----
 dom/src/jsurl/nsJSProtocolHandler.cpp          | 11 ++++-------
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/browser/base/content/test/browser_bug676619.js b/browser/base/content/test/browser_bug676619.js
index 23dd66e87c9..647ec2495f1 100644
--- a/browser/base/content/test/browser_bug676619.js
+++ b/browser/base/content/test/browser_bug676619.js
@@ -23,7 +23,6 @@ function test () {
 
     function testLink(link, name, next) {
         addWindowListener("chrome://mozapps/content/downloads/unknownContentType.xul", function (win) {
-            is(doc.getElementById("unload-flag").textContent, "Okay", "beforeunload shouldn't have fired");
             is(win.document.getElementById("location").value, name, "file name should match");
             win.close();
             next();
@@ -118,4 +117,4 @@ TabOpenListener.prototype = {
       this.closecallback = null;
     }
   }
-};
+};
\ No newline at end of file
diff --git a/browser/base/content/test/download_page.html b/browser/base/content/test/download_page.html
index 541f6f88b36..3f5c34d3d7d 100644
--- a/browser/base/content/test/download_page.html
+++ b/browser/base/content/test/download_page.html
@@ -33,15 +33,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=676619
 
         li.appendChild(a);
         document.getElementsByTagName('ul')[0].appendChild(li);
-
-        window.addEventListener("beforeunload", function (evt) {
-            document.getElementById("unload-flag").textContent = "Fail";
-        });
     </script>
     <ul>
         <li><a href="http://example.com/"
                 download="example.com" id="link7" target="_blank">Download "example.com"</a></li>
     <ul>
-    <div id="unload-flag">Okay</div>
   </body>
 </html>
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 064f3fe96ca..2c58d328f6a 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -8982,13 +8982,12 @@ nsDocShell::InternalLoad(nsIURI * aURI,
     if (!bIsJavascript) {
         MaybeInitTiming();
     }
-    bool timeBeforeUnload = mTiming && aFileName.IsVoid();
-    if (timeBeforeUnload) {
+    if (mTiming) {
       mTiming->NotifyBeforeUnload();
     }
     // Check if the page doesn't want to be unloaded. The javascript:
     // protocol handler deals with this for javascript: URLs.
-    if (!bIsJavascript && aFileName.IsVoid() && mContentViewer) {
+    if (!bIsJavascript && mContentViewer) {
         bool okToUnload;
         rv = mContentViewer->PermitUnload(false, &okToUnload);
 
@@ -8999,7 +8998,7 @@ nsDocShell::InternalLoad(nsIURI * aURI,
         }
     }
 
-    if (timeBeforeUnload) {
+    if (mTiming) {
       mTiming->NotifyUnloadAccepted(mCurrentURI);
     }
 
diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp
index 03df7d307de..0669d2b6cf3 100644
--- a/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -785,13 +785,10 @@ nsJSChannel::EvaluateScript()
     nsLoadFlags loadFlags;
     mStreamChannel->GetLoadFlags(&loadFlags);
 
-    uint32_t disposition;
-    if (NS_FAILED(mStreamChannel->GetContentDisposition(&disposition)))
-        disposition = nsIChannel::DISPOSITION_INLINE;
-    if (loadFlags & LOAD_DOCUMENT_URI && disposition != nsIChannel::DISPOSITION_ATTACHMENT) {
-        // We're loaded as the document channel and not expecting to download
-        // the result. If we go on, we'll blow away the current document. Make
-        // sure that's ok. If so, stop all pending network loads.
+    if (loadFlags & LOAD_DOCUMENT_URI) {
+        // We're loaded as the document channel. If we go on,
+        // we'll blow away the current document. Make sure that's
+        // ok. If so, stop all pending network loads.
 
         nsCOMPtr<nsIDocShell> docShell;
         NS_QueryNotificationCallbacks(mStreamChannel, docShell);