Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-17 04:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #242044 - Reduce number of allocations by nsSpaceManager::PushState

Browse Source
This commit is contained in:
jim_nance%yahoo.com 2004-06-06 18:45:02 +00:00
parent f5f54cfb5e
commit b7b7c52bc2
4 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
layout/base/src/nsSpaceManager.cpp
View File

@ -133,7 +133,7 @@ nsSpaceManager::~nsSpaceManager()
NS_ASSERTION(!mSavedStates, "states remaining on state stack");
while (mSavedStates){
while (mSavedStates && mSavedStates != &mAutoState){
SpaceManagerState *state = mSavedStates;
mSavedStates = state->mNext;
delete state;
@ -979,7 +979,13 @@ nsSpaceManager::PushState()
// Allowing mFloatDamage to accumulate the damage incurred during both
// reflows ensures that nothing gets missed.
SpaceManagerState *state = new SpaceManagerState;
SpaceManagerState *state;
if(mSavedStates) {
state = new SpaceManagerState;
} else {
state = &mAutoState;
}
NS_ASSERTION(state, "PushState() failed!");
@ -994,6 +1000,8 @@ nsSpaceManager::PushState()
if (mFrameInfoMap) {
state->mLastFrame = mFrameInfoMap->mFrame;
} else {
state->mLastFrame = nsnull;
}
// Now that we've saved our state, add it to mSavedStates.
@ -1038,11 +1046,14 @@ nsSpaceManager::PopState()
mLowestTop = mSavedStates->mLowestTop;
// Now that we've restored our state, pop the topmost
// state and delete it.
// state and delete it. Make sure not to delete the mAutoState element
// as it is embeded in this class
SpaceManagerState *state = mSavedStates;
mSavedStates = mSavedStates->mNext;
delete state;
if(state != &mAutoState) {
delete state;
}
}
nscoord

4
layout/base/src/nsSpaceManager.h
View File

@ -332,9 +332,6 @@ protected:
nscoord mXMost;
nscoord mLowestTop;
SpaceManagerState *mNext;
SpaceManagerState() : mX(0), mY(0), mLastFrame(nsnull), mNext(nsnull) {}
~SpaceManagerState() {}
};
public:
@ -411,6 +408,7 @@ protected:
nsIntervalSet mFloatDamage;
SpaceManagerState *mSavedStates;
SpaceManagerState mAutoState;
protected:
FrameInfo* GetFrameInfoFor(nsIFrame* aFrame);

19
layout/generic/nsSpaceManager.cpp
View File

@ -133,7 +133,7 @@ nsSpaceManager::~nsSpaceManager()
NS_ASSERTION(!mSavedStates, "states remaining on state stack");
while (mSavedStates){
while (mSavedStates && mSavedStates != &mAutoState){
SpaceManagerState *state = mSavedStates;
mSavedStates = state->mNext;
delete state;
@ -979,7 +979,13 @@ nsSpaceManager::PushState()
// Allowing mFloatDamage to accumulate the damage incurred during both
// reflows ensures that nothing gets missed.
SpaceManagerState *state = new SpaceManagerState;
SpaceManagerState *state;
if(mSavedStates) {
state = new SpaceManagerState;
} else {
state = &mAutoState;
}
NS_ASSERTION(state, "PushState() failed!");
@ -994,6 +1000,8 @@ nsSpaceManager::PushState()
if (mFrameInfoMap) {
state->mLastFrame = mFrameInfoMap->mFrame;
} else {
state->mLastFrame = nsnull;
}
// Now that we've saved our state, add it to mSavedStates.
@ -1038,11 +1046,14 @@ nsSpaceManager::PopState()
mLowestTop = mSavedStates->mLowestTop;
// Now that we've restored our state, pop the topmost
// state and delete it.
// state and delete it. Make sure not to delete the mAutoState element
// as it is embeded in this class
SpaceManagerState *state = mSavedStates;
mSavedStates = mSavedStates->mNext;
delete state;
if(state != &mAutoState) {
delete state;
}
}
nscoord

4
layout/generic/nsSpaceManager.h
View File

@ -332,9 +332,6 @@ protected:
nscoord mXMost;
nscoord mLowestTop;
SpaceManagerState *mNext;
SpaceManagerState() : mX(0), mY(0), mLastFrame(nsnull), mNext(nsnull) {}
~SpaceManagerState() {}
};
public:
@ -411,6 +408,7 @@ protected:
nsIntervalSet mFloatDamage;
SpaceManagerState *mSavedStates;
SpaceManagerState mAutoState;
protected:
FrameInfo* GetFrameInfoFor(nsIFrame* aFrame);