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

Bug 1107721 - Separate pfd unlinking code to method UnlinkFrame. r=dbaron

Browse Source 
The comment of UnlinkFrame says that the PFDs of linked annotations
won't be freed immediately, which is not implemented in this patch,
but in the next patch.

--HG--
extra : source : 813840414cb9140b71ae3f337a96236689dac705
This commit is contained in:
Xidorn Quan 2014-12-09 09:14:49 +11:00
parent 336e79d644
commit 8b362d00e4
2 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
layout/generic/nsLineLayout.cpp
View File

@ -484,20 +484,8 @@ nsLineLayout::SplitLineTo(int32_t aNewCount)
pfd->mNext = nullptr;
psd->mLastFrame = pfd;
// Now release all of the frames following pfd
pfd = next;
while (nullptr != pfd) {
next = pfd->mNext;
pfd->mNext = mBaseLineLayout->mFrameFreeList;
mBaseLineLayout->mFrameFreeList = pfd;
#ifdef DEBUG
mBaseLineLayout->mFramesFreed++;
#endif
if (nullptr != pfd->mSpan) {
FreeSpan(pfd->mSpan);
}
pfd = next;
}
// Now unlink all of the frames following pfd
UnlinkFrame(next);
break;
}
pfd = pfd->mNext;
@ -534,15 +522,9 @@ nsLineLayout::PushFrame(nsIFrame* aFrame)
psd->mLastFrame = prevFrame;
}
// Now free it, and if it has a span, free that too
pfd->mNext = mBaseLineLayout->mFrameFreeList;
mBaseLineLayout->mFrameFreeList = pfd;
#ifdef DEBUG
mBaseLineLayout->mFramesFreed++;
#endif
if (nullptr != pfd->mSpan) {
FreeSpan(pfd->mSpan);
}
// Now unlink the frame
MOZ_ASSERT(!pfd->mNext);
UnlinkFrame(pfd);
#ifdef NOISY_PUSHING
nsFrame::IndentBy(stdout, mSpanDepth);
printf("PushFrame: %p after:\n", psd);
@ -551,15 +533,13 @@ nsLineLayout::PushFrame(nsIFrame* aFrame)
}
void
nsLineLayout::FreeSpan(PerSpanData* psd)
nsLineLayout::UnlinkFrame(PerFrameData* pfd)
{
// Free its frames
PerFrameData* pfd = psd->mFirstFrame;
while (nullptr != pfd) {
PerFrameData* next = pfd->mNext;
if (nullptr != pfd->mSpan) {
FreeSpan(pfd->mSpan);
}
PerFrameData* next = pfd->mNext;
pfd->mNext = mBaseLineLayout->mFrameFreeList;
mBaseLineLayout->mFrameFreeList = pfd;
#ifdef DEBUG
@ -567,6 +547,13 @@ nsLineLayout::FreeSpan(PerSpanData* psd)
#endif
pfd = next;
}
}
void
nsLineLayout::FreeSpan(PerSpanData* psd)
{
// Unlink its frames
UnlinkFrame(psd->mFirstFrame);
// Now put the span on the free list since it's free too
psd->mNextFreeSpan = mBaseLineLayout->mSpanFreeList;

8
layout/generic/nsLineLayout.h
View File

@ -605,6 +605,14 @@ protected:
*/
PerSpanData* NewPerSpanData();
/**
* Unlink the given PerFrameData and all the siblings after it from
* the span. The unlinked PFDs are usually freed immediately.
* However, if PFD_ISLINKEDTOBASE is set, it won't be freed until
* the frame of its base is unlinked.
*/
void UnlinkFrame(PerFrameData* pfd);
void FreeSpan(PerSpanData* psd);
bool InBlockContext() const {