import changes from tenfourfox-history:

- #444, #334: retune session store; remove telemetry (8482c1f9d)
- Revert "conditional check for PPC/x86" temporarily to make better pull request. (40c43f15b)
- look for log2() without std namespace (a61d449ef)
- rewrite access to control and FPU structures (2b58e23b7)
- #438: revert M1371908 for startup assertions and crashes (ad2a5336b)
- Wrong revert! Revert "Revert "conditional check for PPC/x86" temporarily to make better pull request." (9781a9144)
- Corretly revert to allow better pull. Revert "remove flags to remove altivec from here" (69a66da97)
- #399: ChildNode-ParentNode DOM4 M911477 M1301777 M1308922 M1104955 M1054759 M1258163 (bc5e0e5db)
- Revert "look for log2() without std namespace" - need to investigate more (16fa9b6b4)
- #399: M1249913 M1310403 M1260515 (fa3943ab2)
- #399: passive event listener support M1266066 (3b4f93bf6)
- #399: abspos edge case M1379306 (aaa273649)
- #455: remove unnecessary compiler options (36134ebb3)
- #457: update certs and pins (245059e2b)
- #446: refresh driver overhaul + M1367830 M1352205 (85934d6f5)
- add CONTRIBUTING (35e86c9ee)
- #446: reduce throttle interval (ce4255be2)
- #457, #459: M1413741 M1408990 M1418922 M1422389 M1415598 M1423159 M1399400 M1428589 M1427870 M1425780 (1b84841d6)
- #457: M1414425 M1418854 M1411708 M1395508 M1408017 M1425000 + assertion tweaks (f3d191862)
- #457: M1419363 + WeakPtr support from M1267918 (014868942)
- #457: M1414452 converted to nsAutoTArray from AutoTArray (ba925258b)
- #457: M1412145 (c8c5a6c2b)

docshell/base/nsDocShell.cpp

@@ -6493,8 +6493,10 @@ nsDocShell::ScrollByPages(int32_t aNumPages)
 //*****************************************************************************
 
 NS_IMETHODIMP
-nsDocShell::RefreshURI(nsIURI* aURI, int32_t aDelay, bool aRepeat,
-                       bool aMetaRefresh)
+nsDocShell::RefreshURI(nsIURI* aURI,
+                       int32_t aDelay, bool aRepeat,
+                       bool aMetaRefresh,
+                       nsIPrincipal* aPrincipal)
 {
   NS_ENSURE_ARG(aURI);
 
@@ -6529,6 +6531,7 @@ nsDocShell::RefreshURI(nsIURI* aURI, int32_t aDelay, bool aRepeat,
   nsCOMPtr<nsISupports> dataRef = refreshTimer;  // Get the ref count to 1
 
   refreshTimer->mDocShell = this;
+  refreshTimer->mPrincipal = aPrincipal;
   refreshTimer->mURI = aURI;
   refreshTimer->mDelay = aDelay;
   refreshTimer->mRepeat = aRepeat;
@@ -6560,7 +6563,8 @@ nsresult
 nsDocShell::ForceRefreshURIFromTimer(nsIURI* aURI,
                                      int32_t aDelay,
                                      bool aMetaRefresh,
-                                     nsITimer* aTimer)
+                                     nsITimer* aTimer,
+                                     nsIPrincipal* aPrincipal)
 {
   NS_PRECONDITION(aTimer, "Must have a timer here");
 
@@ -6578,7 +6582,7 @@ nsDocShell::ForceRefreshURIFromTimer(nsIURI* aURI,
     }
   }
 
-  return ForceRefreshURI(aURI, aDelay, aMetaRefresh);
+  return ForceRefreshURI(aURI, aDelay, aMetaRefresh, aPrincipal);
 }
 
 bool
@@ -6608,7 +6612,7 @@ nsDocShell::DoAppRedirectIfNeeded(nsIURI* aURI,
 }
 
 NS_IMETHODIMP
-nsDocShell::ForceRefreshURI(nsIURI* aURI, int32_t aDelay, bool aMetaRefresh)
+nsDocShell::ForceRefreshURI(nsIURI* aURI, int32_t aDelay, bool aMetaRefresh, nsIPrincipal* aPrincipal)
 {
   NS_ENSURE_ARG(aURI);
 
@@ -6656,11 +6660,18 @@ nsDocShell::ForceRefreshURI(nsIURI* aURI, int32_t aDelay, bool aMetaRefresh)
     loadInfo->SetLoadType(nsIDocShellLoadInfo::loadRefresh);
   }
 
+  // If the principal is null, the refresh will have a triggeringPrincipal
+  // derived from the referrer URI, or will be set to the system principal
+  // if there is no refererrer. See LoadURI()
+  if (aPrincipal) {
+    loadInfo->SetOwner(aPrincipal); // as called prior to bug 1286472
+  }
+
   /*
    * LoadURI(...) will cancel all refresh timers... This causes the
    * Timer and its refreshData instance to be released...
    */
-  LoadURI(aURI, loadInfo, nsIWebNavigation::LOAD_FLAGS_NONE, true);
+  LoadURI(aURI, loadInfo, nsIWebNavigation::LOAD_FLAGS_DISALLOW_INHERIT_OWNER, true); // XXX: LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL
 
   return NS_OK;
 }
@@ -6896,7 +6907,7 @@ nsDocShell::SetupRefreshURIFromHeader(nsIURI* aBaseURI,
           return NS_ERROR_FAILURE;
         }
 
-        rv = RefreshURI(uri, seconds * 1000, false, true);
+        rv = RefreshURI(uri, seconds * 1000, false, true, aPrincipal);
       }
     }
   }
@@ -12974,7 +12985,7 @@ nsRefreshTimer::Notify(nsITimer* aTimer)
     // Get the delay count to determine load type
     uint32_t delay = 0;
     aTimer->GetDelay(&delay);
-    mDocShell->ForceRefreshURIFromTimer(mURI, delay, mMetaRefresh, aTimer);
+    mDocShell->ForceRefreshURIFromTimer(mURI, delay, mMetaRefresh, aTimer, mPrincipal);
   }
   return NS_OK;
 }