Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1361086: Simplify UndisplayedMap::GetListFor/GetOrCreateListFor to take nsIContent* rather than nsIContent**. r=emilio

Browse Source 
This patch shouldn't affect behavior -- it just takes a latent opportunity for
simplification and removes an unused layer of indirection. These functions were
set up to look like they took outparams, but none of the callers were using the
value left in the outparam.

MozReview-Commit-ID: LaL7YiyVYS2

--HG--
extra : rebase_source : 28466d6ab36da2e3609e7ed0fdb51618e652c7f7
This commit is contained in:
Daniel Holbert 2017-05-01 09:57:55 -07:00
parent 8953bcba61
commit 74687b05c2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
layout/base/nsFrameManager.cpp
View File

@ -116,8 +116,8 @@ public:
void Clear();
protected:
LinkedList<UndisplayedNode>* GetListFor(nsIContent** aParentContent);
LinkedList<UndisplayedNode>* GetOrCreateListFor(nsIContent** aParentContent);
LinkedList<UndisplayedNode>* GetListFor(nsIContent* aParentContent);
LinkedList<UndisplayedNode>* GetOrCreateListFor(nsIContent* aParentContent);
void AppendNodeFor(UndisplayedNode* aNode, nsIContent* aParentContent);
/**
* Get the applicable parent for the map lookup. This is almost always the
@ -716,12 +716,12 @@ nsFrameManagerBase::UndisplayedMap::GetApplicableParent(nsIContent* aParent)
}
LinkedList<UndisplayedNode>*
nsFrameManagerBase::UndisplayedMap::GetListFor(nsIContent** aParent)
nsFrameManagerBase::UndisplayedMap::GetListFor(nsIContent* aParent)
{
*aParent = GetApplicableParent(*aParent);
aParent = GetApplicableParent(aParent);
LinkedList<UndisplayedNode>* list;
if (Get(*aParent, &list)) {
if (Get(aParent, &list)) {
return list;
}
@ -729,17 +729,17 @@ nsFrameManagerBase::UndisplayedMap::GetListFor(nsIContent** aParent)
}
LinkedList<UndisplayedNode>*
nsFrameManagerBase::UndisplayedMap::GetOrCreateListFor(nsIContent** aParent)
nsFrameManagerBase::UndisplayedMap::GetOrCreateListFor(nsIContent* aParent)
{
*aParent = GetApplicableParent(*aParent);
return LookupOrAdd(*aParent);
aParent = GetApplicableParent(aParent);
return LookupOrAdd(aParent);
}
UndisplayedNode*
nsFrameManagerBase::UndisplayedMap::GetFirstNode(nsIContent* aParentContent)
{
auto* list = GetListFor(&aParentContent);
auto* list = GetListFor(aParentContent);
return list ? list->getFirst() : nullptr;
}
@ -748,7 +748,7 @@ void
nsFrameManagerBase::UndisplayedMap::AppendNodeFor(UndisplayedNode* aNode,
nsIContent* aParentContent)
{
LinkedList<UndisplayedNode>* list = GetOrCreateListFor(&aParentContent);
LinkedList<UndisplayedNode>* list = GetOrCreateListFor(aParentContent);
#ifdef DEBUG
for (UndisplayedNode* node = list->getFirst(); node; node = node->getNext()) {
@ -776,7 +776,7 @@ nsFrameManagerBase::UndisplayedMap::RemoveNodeFor(nsIContent* aParentContent,
UndisplayedNode* aNode)
{
#ifdef DEBUG
auto list = GetListFor(&aParentContent);
auto list = GetListFor(aParentContent);
MOZ_ASSERT(list, "content not in map");
aNode->removeFrom(*list);
#else