Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2025-02-07 09:31:28 +00:00
Code Issues Projects Releases Wiki Activity

fix an assert M1416774

Browse Source
This commit is contained in:
Cameron Kaiser 2018-10-27 17:45:28 -07:00
parent 3926185105
commit c9ed275af7
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
image/imgLoader.cpp
View File

@ -2757,6 +2757,12 @@ imgCacheValidator::AddProxy(imgRequestProxy* aProxy)
mProxies.AppendObject(aProxy); mProxies.AppendObject(aProxy);
} }
void
imgCacheValidator::RemoveProxy(imgRequestProxy* aProxy)
{
mProxies.RemoveObject(aProxy);
}
/** nsIRequestObserver methods **/ /** nsIRequestObserver methods **/
NS_IMETHODIMP NS_IMETHODIMP

1
image/imgLoader.h
View File

@ -529,6 +529,7 @@ public:
bool forcePrincipalCheckForCacheEntry); bool forcePrincipalCheckForCacheEntry);
void AddProxy(imgRequestProxy* aProxy); void AddProxy(imgRequestProxy* aProxy);
void RemoveProxy(imgRequestProxy* aProxy);
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER

14
image/imgRequestProxy.cpp
View File

@ -338,14 +338,20 @@ imgRequestProxy::CancelAndForgetObserver(nsresult aStatus)
mCanceled = true; mCanceled = true;
imgRequest* owner = GetOwner();
if (owner) {
imgCacheValidator* validator = owner->GetValidator();
if (validator) {
validator->RemoveProxy(this);
}
owner->RemoveProxy(this, aStatus);
}
// Now cheat and make sure our removal from loadgroup happens async // Now cheat and make sure our removal from loadgroup happens async
bool oldIsInLoadGroup = mIsInLoadGroup; bool oldIsInLoadGroup = mIsInLoadGroup;
mIsInLoadGroup = false; mIsInLoadGroup = false;
if (GetOwner()) {
GetOwner()->RemoveProxy(this, aStatus);
}
mIsInLoadGroup = oldIsInLoadGroup; mIsInLoadGroup = oldIsInLoadGroup;
if (mIsInLoadGroup) { if (mIsInLoadGroup) {