Merge mozilla-central to inbound. a=merge CLOSED TREE

2019-05-02 07:40:07 +03:00
parent a7248a358c 4d13b045ed
commit f0f0e53c19
101 changed files with 3463 additions and 497 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -4257,6 +4257,10 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
    if (messageStr.IsEmpty()) {
      messageStr.AssignLiteral(u" ");
    }
+  } else if (NS_ERROR_FRAME_CRASHED == aError) {
+    errorPage.AssignLiteral("framecrashed");
+    error = "framecrashed";
+    messageStr.AssignLiteral(u" ");
  } else if (NS_ERROR_BUILDID_MISMATCH == aError) {
    errorPage.AssignLiteral("restartrequired");
    error = "restartrequired";