Merge mozilla-central to mozilla-inbound r=merge a=merge on a CLOSED TREE

docshell/base/nsDocShell.cpp

@@ -13559,6 +13559,12 @@ nsDocShell::ConfirmRepost(bool* aRepost)
     return rv;
   }
 
+  // Make the repost prompt tab modal to prevent malicious pages from locking
+  // up the browser, see bug 1412559 for an example.
+  if (nsCOMPtr<nsIWritablePropertyBag2> promptBag = do_QueryInterface(prompter)) {
+    promptBag->SetPropertyAsBool(NS_LITERAL_STRING("allowTabModal"), true);
+  }
+
   int32_t buttonPressed;
   // The actual value here is irrelevant, but we can't pass an invalid
   // bool through XPConnect.