diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-10-24 10:42:23 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-10-24 10:42:23 +0000 |
| commit | e1db27e19989db11fef70f439cf95821316535b3 (patch) | |
| tree | abac2c9f5115323a8816d3ef600d8cb2bca5a33e /dom/base/nsImageLoadingContent.cpp | |
| parent | a98d06380fe706e3b1b602411c597b9882516b3e (diff) | |
| parent | a5203631d8cded437c05243cde17cddeba13e3ec (diff) | |
| download | UXP-e1db27e19989db11fef70f439cf95821316535b3.tar UXP-e1db27e19989db11fef70f439cf95821316535b3.tar.gz UXP-e1db27e19989db11fef70f439cf95821316535b3.tar.lz UXP-e1db27e19989db11fef70f439cf95821316535b3.tar.xz UXP-e1db27e19989db11fef70f439cf95821316535b3.zip | |
Merge branch 'redwood' into releaseRELBASE_20201024RC_20201024
Diffstat (limited to 'dom/base/nsImageLoadingContent.cpp')
| -rw-r--r-- | dom/base/nsImageLoadingContent.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp index 4aad55941..07bdb6967 100644 --- a/dom/base/nsImageLoadingContent.cpp +++ b/dom/base/nsImageLoadingContent.cpp @@ -933,8 +933,12 @@ nsImageLoadingContent::LoadImage(nsIURI* aNewURI, MOZ_ASSERT(!req, "Shouldn't have non-null request here"); // If we don't have a current URI, we might as well store this URI so people // know what we tried (and failed) to load. - if (!mCurrentRequest) + if (!mCurrentRequest) { mCurrentURI = aNewURI; + if (mImageBlockingStatus == nsIContentPolicy::ACCEPT) { + mImageBlockingStatus = nsIContentPolicy::REJECT_REQUEST; + } + } FireEvent(NS_LITERAL_STRING("error")); FireEvent(NS_LITERAL_STRING("loadend")); |