Bug 1426234 part 1. Fix preexisting bug where disabling prefetch/preload would turn off HTTP Link headers for stylesheets. r=mystor

MozReview-Commit-ID: 6FcW21tODIZ

dom/base/nsContentSink.cpp

@@ -722,31 +722,29 @@ nsContentSink::ProcessLink(const nsAString& aAnchor, const nsAString& aHref,
     return NS_OK;
   }
 
-  if (!nsContentUtils::PrefetchPreloadEnabled(mDocShell)) {
+  if (nsContentUtils::PrefetchPreloadEnabled(mDocShell)) {
-    return NS_OK;
+    // prefetch href if relation is "next" or "prefetch"
-  }
+    if ((linkTypes & nsStyleLinkElement::eNEXT) ||
-
+        (linkTypes & nsStyleLinkElement::ePREFETCH) ||
-  // prefetch href if relation is "next" or "prefetch"
+        (linkTypes & nsStyleLinkElement::ePRELOAD)) {
-  if ((linkTypes & nsStyleLinkElement::eNEXT) ||
+      PrefetchPreloadHref(aHref, mDocument, linkTypes, aAs, aType, aMedia);
-      (linkTypes & nsStyleLinkElement::ePREFETCH) ||
-      (linkTypes & nsStyleLinkElement::ePRELOAD)) {
-    PrefetchPreloadHref(aHref, mDocument, linkTypes, aAs, aType, aMedia);
-  }
-
-  if (linkTypes & nsStyleLinkElement::ePRERENDER) {
-    nsCOMPtr<nsIURI> href;
-    nsresult rv = NS_NewURI(getter_AddRefs(href), aHref);
-    if (NS_SUCCEEDED(rv)) {
-      mDocument->PrerenderHref(href);
     }
-  }
 
-  if (!aHref.IsEmpty() && (linkTypes & nsStyleLinkElement::eDNS_PREFETCH)) {
+    if (linkTypes & nsStyleLinkElement::ePRERENDER) {
-    PrefetchDNS(aHref);
+      nsCOMPtr<nsIURI> href;
-  }
+      nsresult rv = NS_NewURI(getter_AddRefs(href), aHref);
+      if (NS_SUCCEEDED(rv)) {
+        mDocument->PrerenderHref(href);
+      }
+    }
 
-  if (!aHref.IsEmpty() && (linkTypes & nsStyleLinkElement::ePRECONNECT)) {
+    if (!aHref.IsEmpty() && (linkTypes & nsStyleLinkElement::eDNS_PREFETCH)) {
-    Preconnect(aHref, aCrossOrigin);
+      PrefetchDNS(aHref);
+    }
+
+    if (!aHref.IsEmpty() && (linkTypes & nsStyleLinkElement::ePRECONNECT)) {
+      Preconnect(aHref, aCrossOrigin);
+    }
   }
 
   // is it a stylesheet link?