wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make nsStyleChangeList own a reference to nsIContent pointers in its list. b=399694 r+sr=dbaron a1.9=damons

Browse Source
This commit is contained in:
mats.palmgren@bredband.net 2008-03-15 02:01:18 -07:00
parent 995e391a0c
commit 1b90e26ff7
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
layout/base/nsStyleChangeList.cpp
View File

@ -48,7 +48,7 @@
static const PRUint32 kGrowArrayBy = 10;
nsStyleChangeList::nsStyleChangeList(void)
nsStyleChangeList::nsStyleChangeList()
: mArray(mBuffer),
mArraySize(kStyleChangeBufferSize),
mCount(0)
@ -56,7 +56,7 @@ nsStyleChangeList::nsStyleChangeList(void)
MOZ_COUNT_CTOR(nsStyleChangeList);
}
nsStyleChangeList::~nsStyleChangeList(void)
nsStyleChangeList::~nsStyleChangeList()
{
MOZ_COUNT_DTOR(nsStyleChangeList);
Clear();
@ -97,9 +97,9 @@ nsStyleChangeList::AppendChange(nsIFrame* aFrame, nsIContent* aContent, nsChange
if ((0 < mCount) && (aHint & nsChangeHint_ReconstructFrame)) { // filter out all other changes for same content
if (aContent) {
PRInt32 index = mCount;
while (0 < index--) {
for (PRInt32 index = mCount - 1; index >= 0; --index) {
if (aContent == mArray[index].mContent) { // remove this change
aContent->Release();
mCount--;
if (index < mCount) { // move later changes down
::memmove(&mArray[index], &mArray[index + 1],
@ -132,6 +132,9 @@ nsStyleChangeList::AppendChange(nsIFrame* aFrame, nsIContent* aContent, nsChange
}
mArray[mCount].mFrame = aFrame;
mArray[mCount].mContent = aContent;
if (aContent) {
aContent->AddRef();
}
mArray[mCount].mHint = aHint;
mCount++;
}
@ -141,6 +144,12 @@ nsStyleChangeList::AppendChange(nsIFrame* aFrame, nsIContent* aContent, nsChange
void
nsStyleChangeList::Clear()
{
for (PRInt32 index = mCount - 1; index >= 0; --index) {
nsIContent* content = mArray[index].mContent;
if (content) {
content->Release();
}
}
if (mArray != mBuffer) {
delete [] mArray;
mArray = mBuffer;

16
layout/base/nsStyleChangeList.h
View File

@ -58,18 +58,27 @@ struct nsStyleChangeData {
static const PRUint32 kStyleChangeBufferSize = 10;
// Note: nsStyleChangeList owns a reference to
// nsIContent pointers in its list.
class nsStyleChangeList {
public:
nsStyleChangeList(void);
~nsStyleChangeList(void);
nsStyleChangeList();
~nsStyleChangeList();
PRInt32 Count(void) const {
return mCount;
}
/**
* Fills in pointers without reference counting.
*/
nsresult ChangeAt(PRInt32 aIndex, nsIFrame*& aFrame, nsIContent*& aContent,
nsChangeHint& aHint) const;
/**
* Fills in a pointer to the list entry storage (no reference counting
* involved).
*/
nsresult ChangeAt(PRInt32 aIndex, const nsStyleChangeData** aChangeData) const;
nsresult AppendChange(nsIFrame* aFrame, nsIContent* aContent, nsChangeHint aHint);
@ -84,6 +93,9 @@ protected:
PRInt32 mArraySize;
PRInt32 mCount;
nsStyleChangeData mBuffer[kStyleChangeBufferSize];
private:
nsStyleChangeList(const nsStyleChangeList&); // not implemented
};