Bug 1213267 - Fix view-source address. r=bz. a=ritu
authorDragana Damjanovic <dd.mozilla@gmail.com>
Wed, 02 Mar 2016 15:51:01 -0800
changeset 260973 dfea8f0ec4b7ed4ece4f0457c3cbf915ffa1d6cd
parent 260972 b3b151a6e08730e81227102fc2827fc9fd041ecf
child 260974 15873a924eac11350a4bf33d79c46aa9572d9dd9
push id294
push userkwierso@gmail.com
push dateWed, 02 Mar 2016 23:55:05 +0000
treeherdermozilla-esr38@dd4b90de8fd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, ritu
bugs1213267
milestone38.6.0
Bug 1213267 - Fix view-source address. r=bz. a=ritu MozReview-Commit-ID: LqLjuaJXN1S
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5672,16 +5672,20 @@ nsDocShell::LoadPage(nsISupports* aPageD
     newSpec.AppendLiteral("view-source:");
     newSpec.Append(spec);
 
     rv = NS_NewURI(getter_AddRefs(newUri), newSpec);
     if (NS_FAILED(rv)) {
       return rv;
     }
     shEntry->SetURI(newUri);
+    nsCOMPtr<nsISHEntry_ESR38> entryESR38 = do_QueryInterface(shEntry);
+    if (entryESR38) {
+      entryESR38->SetOriginalURI(nullptr);
+    }
   }
 
   rv = LoadHistoryEntry(shEntry, LOAD_HISTORY);
   return rv;
 }
 
 NS_IMETHODIMP
 nsDocShell::GetCurrentDescriptor(nsISupports** aPageDescriptor)