Bug 751905 - about:memory and JS console broken on inbound tip in unpackaged build. r=bz
authorJohnny Stenback <jst@mozilla.com>
Fri, 04 May 2012 21:46:02 -0400
changeset 93170 0a48e65615346b68042ba2eb24442a79c3c56c22
parent 93169 6d6e9cc558f0154390c9e347b7957b5e0641587e
child 93230 ea4c62f4c06307a8a132659628507f1c3b0fe254
child 93276 5a54cd6e9c021700d08d3684518a0017e29b1bb9
push id22615
push userbbondy@mozilla.com
push dateSat, 05 May 2012 01:48:55 +0000
treeherdermozilla-central@0a48e6561534 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs751905
milestone15.0a1
first release with
nightly linux32
0a48e6561534 / 15.0a1 / 20120505030510 / files
nightly linux64
0a48e6561534 / 15.0a1 / 20120505030510 / files
nightly mac
0a48e6561534 / 15.0a1 / 20120505030510 / files
nightly win32
0a48e6561534 / 15.0a1 / 20120505030510 / files
nightly win64
0a48e6561534 / 15.0a1 / 20120505030510 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 751905 - about:memory and JS console broken on inbound tip in unpackaged build. r=bz
chrome/src/nsChromeProtocolHandler.cpp
--- a/chrome/src/nsChromeProtocolHandler.cpp
+++ b/chrome/src/nsChromeProtocolHandler.cpp
@@ -209,16 +209,19 @@ nsChromeProtocolHandler::NewChannel(nsIU
             file->GetNativePath(path);
             printf("Chrome file doesn't exist: %s\n", path.get());
         }
     }
 #endif
 
     // Make sure that the channel remembers where it was
     // originally loaded from.
+    nsLoadFlags loadFlags = 0;
+    result->GetLoadFlags(&loadFlags);
+    result->SetLoadFlags(loadFlags & ~nsIChannel::LOAD_REPLACE);
     rv = result->SetOriginalURI(aURI);
     if (NS_FAILED(rv)) return rv;
 
     // Get a system principal for content files and set the owner
     // property of the result
     nsCOMPtr<nsIURL> url = do_QueryInterface(aURI);
     nsCAutoString path;
     rv = url->GetPath(path);