Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1367207 part 4 - Use LookupRemoveIf() to avoid a second hashtable lookup for Remove(). r=dholbert

Browse Source 
MozReview-Commit-ID: 6EYkiKpLHvI
This commit is contained in:
Mats Palmgren 2017-06-07 15:22:41 +02:00
parent 0630f5b2bf
commit 7dd909a5ce
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
layout/style/ImageLoader.cpp
View File

@ -147,35 +147,35 @@ ImageLoader::RemoveRequestToFrameMapping(imgIRequest* aRequest,
}
#endif
FrameSet* frameSet = nullptr;
mRequestToFrameMap.Get(aRequest, &frameSet);
if (frameSet) {
frameSet->RemoveElementSorted(aFrame);
if (frameSet->IsEmpty()) {
mRequestToFrameMap.Remove(aRequest);
nsPresContext* presContext = GetPresContext();
if (presContext) {
nsLayoutUtils::DeregisterImageRequest(presContext, aRequest, nullptr);
mRequestToFrameMap.LookupRemoveIf(aRequest,
[aRequest, aFrame, this] (FrameSet* aFrameSet) {
MOZ_ASSERT(aFrameSet, "This should never be null");
aFrameSet->RemoveElementSorted(aFrame);
bool remove = aFrameSet->IsEmpty();
if (remove) {
nsPresContext* presContext = GetPresContext();
if (presContext) {
nsLayoutUtils::DeregisterImageRequest(presContext, aRequest, nullptr);
}
}
}
}
return remove;
});
}
void
ImageLoader::RemoveFrameToRequestMapping(imgIRequest* aRequest,
nsIFrame* aFrame)
{
RequestSet* requestSet = nullptr;
mFrameToRequestMap.Get(aFrame, &requestSet);
if (requestSet) {
MOZ_ASSERT(aFrame->HasImageRequest(), "HasImageRequest is lying");
requestSet->RemoveElementSorted(aRequest);
if (requestSet->IsEmpty()) {
mFrameToRequestMap.Remove(aFrame);
aFrame->SetHasImageRequest(false);
}
}
mFrameToRequestMap.LookupRemoveIf(aFrame,
[aRequest, aFrame] (RequestSet* aRequestSet) {
MOZ_ASSERT(aRequestSet, "This should never be null");
aRequestSet->RemoveElementSorted(aRequest);
bool remove = aRequestSet->IsEmpty();
if (remove) {
aFrame->SetHasImageRequest(false);
}
return remove;
});
}
void