Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1388939, part 1 - Rename nsFrameManagerBase::mUndisplayedMap to mDisplayNoneMap. r=dholbert

Browse Source 
MozReview-Commit-ID: 94vA4YJ2u
This commit is contained in:
Jonathan Watt 2017-08-01 13:50:23 +01:00
parent ca2c01b0ad
commit e8f2e75737
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
layout/base/nsFrameManager.cpp
View File

@ -49,7 +49,7 @@ using namespace mozilla::dom;
nsFrameManagerBase::nsFrameManagerBase()
: mPresShell(nullptr)
, mRootFrame(nullptr)
, mUndisplayedMap(nullptr)
, mDisplayNoneMap(nullptr)
, mDisplayContentsMap(nullptr)
, mIsDestroyingFrames(false)
{
@ -122,8 +122,8 @@ nsFrameManager::Destroy()
mRootFrame = nullptr;
}
delete mUndisplayedMap;
mUndisplayedMap = nullptr;
delete mDisplayNoneMap;
mDisplayNoneMap = nullptr;
delete mDisplayContentsMap;
mDisplayContentsMap = nullptr;
@ -179,7 +179,7 @@ nsFrameManager::GetAllUndisplayedNodesInMapFor(UndisplayedMap* aMap,
UndisplayedNode*
nsFrameManager::GetAllUndisplayedContentIn(nsIContent* aParentContent)
{
return GetAllUndisplayedNodesInMapFor(mUndisplayedMap, aParentContent);
return GetAllUndisplayedNodesInMapFor(mDisplayNoneMap, aParentContent);
}
/* static */ void
@ -213,10 +213,10 @@ void
nsFrameManager::SetUndisplayedContent(nsIContent* aContent,
nsStyleContext* aStyleContext)
{
if (!mUndisplayedMap) {
mUndisplayedMap = new UndisplayedMap;
if (!mDisplayNoneMap) {
mDisplayNoneMap = new UndisplayedMap;
}
SetStyleContextInMap(mUndisplayedMap, aContent, aStyleContext);
SetStyleContextInMap(mDisplayNoneMap, aContent, aStyleContext);
}
/* static */ void
@ -251,14 +251,14 @@ nsFrameManager::ClearUndisplayedContentIn(nsIContent* aContent,
printf("ClearUndisplayedContent(%d): content=%p parent=%p --> ", i++, (void *)aContent, (void*)aParentContent);
#endif
if (!mUndisplayedMap) {
if (!mDisplayNoneMap) {
return;
}
for (UndisplayedNode* node = mUndisplayedMap->GetFirstNode(aParentContent);
for (UndisplayedNode* node = mDisplayNoneMap->GetFirstNode(aParentContent);
node; node = node->getNext()) {
if (node->mContent == aContent) {
mUndisplayedMap->RemoveNodeFor(aParentContent, node);
mDisplayNoneMap->RemoveNodeFor(aParentContent, node);
#ifdef DEBUG_UNDISPLAYED_MAP
printf( "REMOVED!\n");
@ -283,8 +283,8 @@ nsFrameManager::ClearAllMapsFor(nsIContent* aParentContent)
printf("ClearAllMapsFor(%d): parent=%p \n", i++, aParentContent);
#endif
if (mUndisplayedMap) {
mUndisplayedMap->RemoveNodesFor(aParentContent);
if (mDisplayNoneMap) {
mDisplayNoneMap->RemoveNodesFor(aParentContent);
}
if (mDisplayContentsMap) {
nsAutoPtr<LinkedList<UndisplayedNode>> list =

6
layout/base/nsFrameManager.h
View File

@ -81,10 +81,10 @@ public:
// Mapping undisplayed content
nsStyleContext* GetUndisplayedContent(const nsIContent* aContent)
{
if (!mUndisplayedMap) {
if (!mDisplayNoneMap) {
return nullptr;
}
return GetStyleContextInMap(mUndisplayedMap, aContent);
return GetStyleContextInMap(mDisplayNoneMap, aContent);
}
mozilla::UndisplayedNode*
GetAllUndisplayedContentIn(nsIContent* aParentContent);
@ -93,7 +93,7 @@ public:
void ChangeUndisplayedContent(nsIContent* aContent,
nsStyleContext* aStyleContext)
{
ChangeStyleContextInMap(mUndisplayedMap, aContent, aStyleContext);
ChangeStyleContextInMap(mDisplayNoneMap, aContent, aStyleContext);
}
void ClearUndisplayedContentIn(nsIContent* aContent,

2
layout/base/nsFrameManagerBase.h
View File

@ -51,7 +51,7 @@ protected:
// weak link, because the pres shell owns us
nsIPresShell* MOZ_NON_OWNING_REF mPresShell;
nsIFrame* mRootFrame;
UndisplayedMap* mUndisplayedMap;
UndisplayedMap* mDisplayNoneMap;
UndisplayedMap* mDisplayContentsMap;
bool mIsDestroyingFrames; // The frame manager is destroying some frame(s).
};