Bug 1038756 - Extending LoadInfo and storing LoadInfo on all channels created through NS_NewChannel - followup: removal of duplicate error check (r=sicking)
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Mon, 04 May 2015 17:02:38 -0700
changeset 273840 83193481f697235ae8a6cb9668f42ab3412f5994
parent 273839 37a740847aede6c01bc52f921a862df04c86f712
child 273841 1952e37ea41541c962b7ed49acba6add708ab37b
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking
bugs1038756
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1038756 - Extending LoadInfo and storing LoadInfo on all channels created through NS_NewChannel - followup: removal of duplicate error check (r=sicking)
dom/html/nsHTMLDocument.cpp
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -1561,23 +1561,16 @@ nsHTMLDocument::Open(JSContext* cx,
                      nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL,
                      nsIContentPolicy::TYPE_OTHER,
                      group);
 
   if (rv.Failed()) {
     return nullptr;
   }
 
-  // We can't depend on channels implementing property bags, so do our
-  // base URI manually after reset.
-
-  if (rv.Failed()) {
-    return nullptr;
-  }
-
   if (callerChannel) {
     nsLoadFlags callerLoadFlags;
     rv = callerChannel->GetLoadFlags(&callerLoadFlags);
     if (rv.Failed()) {
       return nullptr;
     }
 
     nsLoadFlags loadFlags;