import changes from tenfourfox:

bug1414425, bug1418922, bug1422389, bug1423159, bug1399400(ported), bug1395508, bug1425000, bug1425780, bug1425612(ported), bug1426783
#438: revert M1371908 for startup assertions and crashes
#457: M1419363 + WeakPtr support from M1267918

docshell/base/nsDocShell.h

@@ -116,6 +116,7 @@ public:
 
   nsRefPtr<nsDocShell> mDocShell;
   nsCOMPtr<nsIURI> mURI;
+  nsCOMPtr<nsIPrincipal> mPrincipal;
   int32_t mDelay;
   bool mRepeat;
   bool mMetaRefresh;
@@ -248,7 +249,8 @@ public:
   // the timer involved out of mRefreshURIList if it's there.
   // aTimer must not be null.
   nsresult ForceRefreshURIFromTimer(nsIURI* aURI, int32_t aDelay,
-                                    bool aMetaRefresh, nsITimer* aTimer);
+                                    bool aMetaRefresh, nsITimer* aTimer,
+                                    nsIPrincipal* aPrincipal);
 
   friend class OnLinkClickEvent;