From e773557320dc3d9311e1bb2da5e85fbbb79198bb Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Thu, 28 May 2020 00:10:47 +0000
Subject: [PATCH] Bug 1638711 - Call DisplayLoadError for
 NS_ERROR_CONTENT_BLOCKED during EndPageLoad, since we would also have done
 this for the same error during AsyncOpen. r=nika

Differential Revision: https://phabricator.services.mozilla.com/D77171
---
 docshell/base/nsDocShell.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index d0fdf7fc36cb..73cd4a25c345 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -6191,6 +6191,8 @@ nsresult nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
                aStatus == NS_ERROR_NET_INADEQUATE_SECURITY ||
                aStatus == NS_ERROR_NET_HTTP2_SENT_GOAWAY ||
                aStatus == NS_ERROR_NET_HTTP3_PROTOCOL_ERROR ||
+               aStatus == NS_ERROR_CONTENT_BLOCKED_SHOW_ALT ||
+               aStatus == NS_ERROR_CONTENT_BLOCKED ||
                NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_SECURITY) {
       // Errors to be shown for any frame
       DisplayLoadError(aStatus, url, nullptr, aChannel);