зеркало из https://github.com/mozilla/gecko-dev.git
Implemented RemoveRegion()
This commit is contained in:
troy
Родитель
aa181506d4
Коммит
689fa77686
|
|
@ -387,9 +387,9 @@ PRBool SpaceManager::CanJoinBands(BandRect* aBand, BandRect* aPrevBand)
|
|||
PRBool SpaceManager::JoinBands(BandRect* aBand, BandRect* aPrevBand)
|
||||
{
|
||||
if (CanJoinBands(aBand, aPrevBand)) {
|
||||
nscoord topOfPrevBand = aPrevBand->top;
|
||||
BandRect* startOfNextBand = aBand;
|
||||
|
||||
while (topOfPrevBand == aPrevBand->top) {
|
||||
while (aPrevBand != startOfNextBand) {
|
||||
// Adjust the top of the band we're keeping, and then move to the next
|
||||
// rect within the band
|
||||
aBand->top = aPrevBand->top;
|
||||
|
|
@ -777,8 +777,8 @@ PRBool SpaceManager::RemoveRegion(nsIFrame* aFrame)
|
|||
}
|
||||
|
||||
if (!frameInfo->rect.IsEmpty()) {
|
||||
NS_ASSERTION(!mBandList.IsEmpty(), "no bands");
|
||||
BandRect* band = mBandList.Head();
|
||||
NS_ASSERTION(band != &mBandList, "no band rects");
|
||||
BandRect* prevBand = nsnull;
|
||||
PRBool prevFoundMatchingRect = PR_FALSE;
|
||||
|
||||
|
|
@ -795,6 +795,9 @@ PRBool SpaceManager::RemoveRegion(nsIFrame* aFrame)
|
|||
PRBool isSharedRect = PR_FALSE;
|
||||
|
||||
if (rect->IsOccupiedBy(aFrame)) {
|
||||
// Remember that we found a matching rect in this band
|
||||
foundMatchingRect = PR_TRUE;
|
||||
|
||||
if (rect->numFrames > 1) {
|
||||
// The band rect is occupied by more than one frame
|
||||
rect->RemoveFrame(aFrame);
|
||||
|
|
@ -804,23 +807,38 @@ PRBool SpaceManager::RemoveRegion(nsIFrame* aFrame)
|
|||
isSharedRect = PR_TRUE;
|
||||
} else {
|
||||
// The rect isn't shared so just delete it
|
||||
BandRect* next = rect->Next();
|
||||
rect->Remove();
|
||||
}
|
||||
if (rect == band) {
|
||||
// The rect we're deleting is the start of the band
|
||||
if (topOfBand == next->top) {
|
||||
band = next;
|
||||
} else {
|
||||
band = nsnull;
|
||||
}
|
||||
}
|
||||
delete rect;
|
||||
rect = next;
|
||||
|
||||
// Remember that we found a matching rect in this band
|
||||
foundMatchingRect = PR_TRUE;
|
||||
// We don't need to try and coalesce adjacent rects in this case
|
||||
prevRect = nsnull;
|
||||
prevIsSharedRect = PR_FALSE;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// We need to try and coalesce adjacent rects iff we find a shared rect
|
||||
// occupied by aFrame. If either this rect or the previous rect was
|
||||
// shared and occupied by aFrame, then try and coalesce this rect and
|
||||
// the previous rect
|
||||
// If we found a shared rect occupied by aFrame, then we need to try
|
||||
// and coalesce adjacent rects
|
||||
if (prevIsSharedRect || (isSharedRect && (nsnull != prevRect))) {
|
||||
NS_ASSERTION(nsnull != prevRect, "no previous rect");
|
||||
if ((prevRect->right == rect->left) && (prevRect->HasSameFrameList(rect))) {
|
||||
// Modify the current rect's left edge, and delete the previous rect
|
||||
rect->left = prevRect->left;
|
||||
prevRect->Remove();
|
||||
if (prevRect == band) {
|
||||
// the rect we're deleting is the start of the band
|
||||
band = rect;
|
||||
}
|
||||
delete prevRect;
|
||||
}
|
||||
}
|
||||
|
|
@ -829,25 +847,22 @@ PRBool SpaceManager::RemoveRegion(nsIFrame* aFrame)
|
|||
prevRect = rect;
|
||||
prevIsSharedRect = isSharedRect;
|
||||
rect = rect->Next();
|
||||
|
||||
if (rect == &mBandList) {
|
||||
// No bands left
|
||||
rect = nsnull;
|
||||
break;
|
||||
}
|
||||
} while (rect->top == topOfBand);
|
||||
|
||||
// If we found a matching rect in this band or the previous band then try
|
||||
// join the two bands
|
||||
if (prevFoundMatchingRect || (foundMatchingRect && (nsnull != prevBand))) {
|
||||
// Try and join this band with the previous band
|
||||
NS_ASSERTION(nsnull != prevBand, "no previous band");
|
||||
JoinBands(band, prevBand);
|
||||
if (nsnull != band) {
|
||||
// If we found a rect occupied by aFrame in this band or the previous band
|
||||
// then try to join the two bands
|
||||
if (prevFoundMatchingRect || (foundMatchingRect && (nsnull != prevBand))) {
|
||||
// Try and join this band with the previous band
|
||||
NS_ASSERTION(nsnull != prevBand, "no previous band");
|
||||
JoinBands(band, prevBand);
|
||||
}
|
||||
}
|
||||
|
||||
// Move to the next band
|
||||
prevFoundMatchingRect = foundMatchingRect;
|
||||
band = rect;
|
||||
prevBand = band;
|
||||
band = (rect == &mBandList) ? nsnull : rect;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -888,7 +903,7 @@ SpaceManager::FrameInfo* SpaceManager::CreateFrameInfo(nsIFrame* aFrame,
|
|||
|
||||
void SpaceManager::DestroyFrameInfo(FrameInfo* aFrameInfo)
|
||||
{
|
||||
PL_HashTableRemove(mFrameInfoMap, (const void*)aFrameInfo);
|
||||
PL_HashTableRemove(mFrameInfoMap, (const void*)aFrameInfo->frame);
|
||||
delete aFrameInfo;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ public:
|
|||
PRBool TestAddBand();
|
||||
PRBool TestAddBandOverlap();
|
||||
PRBool TestAddRectToBand();
|
||||
PRBool TestRemoveRegion();
|
||||
|
||||
protected:
|
||||
struct BandInfo {
|
||||
|
|
@ -49,8 +50,8 @@ void MySpaceManager::GetBandsInfo(BandsInfo& aBandsInfo)
|
|||
{
|
||||
aBandsInfo.numBands = 0;
|
||||
|
||||
if (!PR_CLIST_IS_EMPTY(&mBandList)) {
|
||||
BandRect* band = (BandRect*)PR_LIST_HEAD(&mBandList);
|
||||
if (!mBandList.IsEmpty()) {
|
||||
BandRect* band = mBandList.Head();
|
||||
while (nsnull != band) {
|
||||
BandInfo& info = aBandsInfo.bands[aBandsInfo.numBands];
|
||||
|
||||
|
|
@ -65,7 +66,7 @@ void MySpaceManager::GetBandsInfo(BandsInfo& aBandsInfo)
|
|||
while (info.yOffset == band->top) {
|
||||
info.numRects++;
|
||||
|
||||
band = (BandRect*)PR_NEXT_LINK(band);
|
||||
band = band->Next();
|
||||
if (band == &mBandList) {
|
||||
// No bands left
|
||||
band = nsnull;
|
||||
|
|
@ -94,7 +95,7 @@ PRBool MySpaceManager::TestAddBand()
|
|||
|
||||
// Clear any existing regions
|
||||
ClearRegions();
|
||||
NS_ASSERTION(PR_CLIST_IS_EMPTY(&mBandList), "clear regions failed");
|
||||
NS_ASSERTION(mBandList.IsEmpty(), "clear regions failed");
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// #1. Add a rect region. Verify the return status, and that a band rect is
|
||||
|
|
@ -179,7 +180,7 @@ PRBool MySpaceManager::TestAddBandOverlap()
|
|||
|
||||
// Clear any existing regions
|
||||
ClearRegions();
|
||||
NS_ASSERTION(PR_CLIST_IS_EMPTY(&mBandList), "clear regions failed");
|
||||
NS_ASSERTION(mBandList.IsEmpty(), "clear regions failed");
|
||||
|
||||
// Add a new band
|
||||
status = AddRectRegion((nsIFrame*)0x01, nsRect(100, 100, 100, 100));
|
||||
|
|
@ -311,7 +312,7 @@ PRBool MySpaceManager::TestAddRectToBand()
|
|||
|
||||
// Clear any existing regions
|
||||
ClearRegions();
|
||||
NS_ASSERTION(PR_CLIST_IS_EMPTY(&mBandList), "clear regions failed");
|
||||
NS_ASSERTION(mBandList.IsEmpty(), "clear regions failed");
|
||||
|
||||
// Add a new band
|
||||
status = AddRectRegion((nsIFrame*)0x01, nsRect(100, 100, 100, 100));
|
||||
|
|
@ -335,7 +336,7 @@ PRBool MySpaceManager::TestAddRectToBand()
|
|||
printf("TestAddRectToBand: wrong first rect (#1)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 100) || (bandRect->right != 200)) {
|
||||
printf("TestAddRectToBand: wrong second rect (#1)\n");
|
||||
return PR_FALSE;
|
||||
|
|
@ -356,12 +357,12 @@ PRBool MySpaceManager::TestAddRectToBand()
|
|||
printf("TestAddRectToBand: wrong first rect (#2)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 100) || (bandRect->right != 200)) {
|
||||
printf("TestAddRectToBand: wrong second rect (#2)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 250) || (bandRect->right != 350)) {
|
||||
printf("TestAddRectToBand: wrong third rect (#2)\n");
|
||||
return PR_FALSE;
|
||||
|
|
@ -383,25 +384,25 @@ PRBool MySpaceManager::TestAddRectToBand()
|
|||
printf("TestAddRectToBand: wrong first rect (#3)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
NS_ASSERTION(1 == bandRect->numFrames, "unexpected shared rect");
|
||||
if ((bandRect->left != 80) || (bandRect->right != 100)) {
|
||||
printf("TestAddRectToBand: wrong second rect (#3)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 100) || (bandRect->right != 120) ||
|
||||
(bandRect->numFrames != 2) || !bandRect->IsOccupiedBy((nsIFrame*)0x04)) {
|
||||
printf("TestAddRectToBand: wrong third rect (#3)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
NS_ASSERTION(1 == bandRect->numFrames, "unexpected shared rect");
|
||||
if ((bandRect->left != 120) || (bandRect->right != 200)) {
|
||||
printf("TestAddRectToBand: wrong fourth rect (#3)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 250) || (bandRect->right != 350)) {
|
||||
printf("TestAddRectToBand: wrong fifth rect (#3)\n");
|
||||
return PR_FALSE;
|
||||
|
|
@ -424,19 +425,19 @@ PRBool MySpaceManager::TestAddRectToBand()
|
|||
printf("TestAddRectToBand: wrong first rect (#4)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 50) || (bandRect->right != 60) ||
|
||||
(bandRect->numFrames != 2) || !bandRect->IsOccupiedBy((nsIFrame*)0x05)) {
|
||||
printf("TestAddRectToBand: wrong second rect (#4)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
NS_ASSERTION(1 == bandRect->numFrames, "unexpected shared rect");
|
||||
if ((bandRect->left != 60) || (bandRect->right != 70)) {
|
||||
printf("TestAddRectToBand: wrong third rect (#4)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
NS_ASSERTION(1 == bandRect->numFrames, "unexpected shared rect");
|
||||
if ((bandRect->left != 80) || (bandRect->right != 100)) {
|
||||
printf("TestAddRectToBand: wrong fourth rect (#4)\n");
|
||||
|
|
@ -460,19 +461,19 @@ PRBool MySpaceManager::TestAddRectToBand()
|
|||
printf("TestAddRectToBand: wrong first rect (#5)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 20) || (bandRect->right != 40) ||
|
||||
(bandRect->numFrames != 2) || !bandRect->IsOccupiedBy((nsIFrame*)0x06)) {
|
||||
printf("TestAddRectToBand: wrong second rect (#5)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
NS_ASSERTION(1 == bandRect->numFrames, "unexpected shared rect");
|
||||
if ((bandRect->left != 40) || (bandRect->right != 50)) {
|
||||
printf("TestAddRectToBand: wrong third rect (#5)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 50) || (bandRect->right != 60) || (bandRect->numFrames != 2)) {
|
||||
printf("TestAddRectToBand: wrong fourth rect (#5)\n");
|
||||
return PR_FALSE;
|
||||
|
|
@ -494,24 +495,24 @@ PRBool MySpaceManager::TestAddRectToBand()
|
|||
printf("TestAddRectToBand: wrong first rect (#6)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 10) || (bandRect->right != 20) ||
|
||||
(bandRect->numFrames != 2) || !bandRect->IsOccupiedBy((nsIFrame*)0x07)) {
|
||||
printf("TestAddRectToBand: wrong second rect (#6)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 20) || (bandRect->right != 30) ||
|
||||
(bandRect->numFrames != 3) || !bandRect->IsOccupiedBy((nsIFrame*)0x07)) {
|
||||
printf("TestAddRectToBand: wrong third rect (#6)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
if ((bandRect->left != 30) || (bandRect->right != 40) || (bandRect->numFrames != 2)) {
|
||||
printf("TestAddRectToBand: wrong fourth rect (#6)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = (BandRect*)PR_NEXT_LINK(bandRect);
|
||||
bandRect = bandRect->Next();
|
||||
NS_ASSERTION(1 == bandRect->numFrames, "unexpected shared rect");
|
||||
if ((bandRect->left != 40) || (bandRect->right != 50)) {
|
||||
printf("TestAddRectToBand: wrong fifth rect (#6)\n");
|
||||
|
|
@ -521,6 +522,105 @@ PRBool MySpaceManager::TestAddRectToBand()
|
|||
return PR_TRUE;
|
||||
}
|
||||
|
||||
// Test of removing regions. We especially need to test that we correctly
|
||||
// coalesce adjacent rects and bands
|
||||
//
|
||||
// This tests the following:
|
||||
// 1. simple test of removing the one and only band rect
|
||||
// 2. removing a shared rect and verifying adjacent rects are coalesced
|
||||
// 3. removing a band rect and making sure adjacent bands are combined
|
||||
PRBool MySpaceManager::TestRemoveRegion()
|
||||
{
|
||||
PRBool status;
|
||||
BandsInfo bandsInfo;
|
||||
BandRect* bandRect;
|
||||
|
||||
// Clear any existing regions
|
||||
ClearRegions();
|
||||
NS_ASSERTION(mBandList.IsEmpty(), "clear regions failed");
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// #1. A simple test of removing the one and only band rect
|
||||
status = AddRectRegion((nsIFrame*)0x01, nsRect(10, 100, 100, 100));
|
||||
NS_ASSERTION(PR_TRUE == status, "unexpected status");
|
||||
status = RemoveRegion((nsIFrame*)0x01);
|
||||
NS_ASSERTION(PR_TRUE == status, "unexpected status");
|
||||
GetBandsInfo(bandsInfo);
|
||||
if (bandsInfo.numBands != 0) {
|
||||
printf("TestRemoveRegion: wrong number of bands (#1): %i\n", bandsInfo.numBands);
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// #2. Test removing a rect that's shared. Make sure adjacent rects are
|
||||
// coalesced
|
||||
status = AddRectRegion((nsIFrame*)0x01, nsRect(10, 100, 100, 100));
|
||||
NS_ASSERTION(PR_TRUE == status, "unexpected status");
|
||||
status = AddRectRegion((nsIFrame*)0x02, nsRect(40, 100, 20, 100));
|
||||
NS_ASSERTION(PR_TRUE == status, "unexpected status");
|
||||
|
||||
// Verify there are three rects in the band
|
||||
GetBandsInfo(bandsInfo);
|
||||
if (bandsInfo.bands[0].numRects != 3) {
|
||||
printf("TestRemoveRegion: wrong number of rects (#2): %i\n", bandsInfo.bands[0].numRects);
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
// Remove the region associated with the second frame
|
||||
status = RemoveRegion((nsIFrame*)0x02);
|
||||
NS_ASSERTION(PR_TRUE == status, "unexpected status");
|
||||
GetBandsInfo(bandsInfo);
|
||||
if (bandsInfo.bands[0].numRects != 1) {
|
||||
printf("TestRemoveRegion: failed to coalesce adjacent rects (#2)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = bandsInfo.bands[0].firstRect;
|
||||
if ((bandRect->left != 10) || (bandRect->right != 110)) {
|
||||
printf("TestRemoveRegion: wrong size rect (#2)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// #3. Test removing a band rect and making sure adjacent bands are combined
|
||||
status = AddRectRegion((nsIFrame*)0x02, nsRect(10, 140, 20, 20));
|
||||
NS_ASSERTION(PR_TRUE == status, "unexpected status");
|
||||
|
||||
// Verify there are three bands and that each band has three rects
|
||||
GetBandsInfo(bandsInfo);
|
||||
if (bandsInfo.numBands != 3) {
|
||||
printf("TestRemoveRegion: wrong number of bands (#3): %i\n", bandsInfo.numBands);
|
||||
return PR_FALSE;
|
||||
}
|
||||
if (bandsInfo.bands[0].numRects != 1) {
|
||||
printf("TestRemoveRegion: band #1 wrong number of rects (#3): %i\n", bandsInfo.bands[0].numRects);
|
||||
return PR_FALSE;
|
||||
}
|
||||
if (bandsInfo.bands[1].numRects != 2) {
|
||||
printf("TestRemoveRegion: band #2 wrong number of rects (#3): %i\n", bandsInfo.bands[1].numRects);
|
||||
return PR_FALSE;
|
||||
}
|
||||
if (bandsInfo.bands[2].numRects != 1) {
|
||||
printf("TestRemoveRegion: band #3 wrong number of rects (#3): %i\n", bandsInfo.bands[2].numRects);
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
// Remove the region associated with the second frame
|
||||
status = RemoveRegion((nsIFrame*)0x02);
|
||||
NS_ASSERTION(PR_TRUE == status, "unexpected status");
|
||||
GetBandsInfo(bandsInfo);
|
||||
if (bandsInfo.bands[0].numRects != 1) {
|
||||
printf("TestRemoveRegion: failed to coalesce adjacent rects (#3)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
bandRect = bandsInfo.bands[0].firstRect;
|
||||
if ((bandRect->left != 10) || (bandRect->right != 110)) {
|
||||
printf("TestRemoveRegion: wrong size rect (#3)\n");
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
||||
|
|
@ -549,6 +649,10 @@ int main(int argc, char** argv)
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (!spaceMgr->TestRemoveRegion()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (!spaceMgr->TestGetBandData()) {
|
||||
return -1;
|
||||
|
|
|
|||
|
|
@ -387,9 +387,9 @@ PRBool SpaceManager::CanJoinBands(BandRect* aBand, BandRect* aPrevBand)
|
|||
PRBool SpaceManager::JoinBands(BandRect* aBand, BandRect* aPrevBand)
|
||||
{
|
||||
if (CanJoinBands(aBand, aPrevBand)) {
|
||||
nscoord topOfPrevBand = aPrevBand->top;
|
||||
BandRect* startOfNextBand = aBand;
|
||||
|
||||
while (topOfPrevBand == aPrevBand->top) {
|
||||
while (aPrevBand != startOfNextBand) {
|
||||
// Adjust the top of the band we're keeping, and then move to the next
|
||||
// rect within the band
|
||||
aBand->top = aPrevBand->top;
|
||||
|
|
@ -777,8 +777,8 @@ PRBool SpaceManager::RemoveRegion(nsIFrame* aFrame)
|
|||
}
|
||||
|
||||
if (!frameInfo->rect.IsEmpty()) {
|
||||
NS_ASSERTION(!mBandList.IsEmpty(), "no bands");
|
||||
BandRect* band = mBandList.Head();
|
||||
NS_ASSERTION(band != &mBandList, "no band rects");
|
||||
BandRect* prevBand = nsnull;
|
||||
PRBool prevFoundMatchingRect = PR_FALSE;
|
||||
|
||||
|
|
@ -795,6 +795,9 @@ PRBool SpaceManager::RemoveRegion(nsIFrame* aFrame)
|
|||
PRBool isSharedRect = PR_FALSE;
|
||||
|
||||
if (rect->IsOccupiedBy(aFrame)) {
|
||||
// Remember that we found a matching rect in this band
|
||||
foundMatchingRect = PR_TRUE;
|
||||
|
||||
if (rect->numFrames > 1) {
|
||||
// The band rect is occupied by more than one frame
|
||||
rect->RemoveFrame(aFrame);
|
||||
|
|
@ -804,23 +807,38 @@ PRBool SpaceManager::RemoveRegion(nsIFrame* aFrame)
|
|||
isSharedRect = PR_TRUE;
|
||||
} else {
|
||||
// The rect isn't shared so just delete it
|
||||
BandRect* next = rect->Next();
|
||||
rect->Remove();
|
||||
}
|
||||
if (rect == band) {
|
||||
// The rect we're deleting is the start of the band
|
||||
if (topOfBand == next->top) {
|
||||
band = next;
|
||||
} else {
|
||||
band = nsnull;
|
||||
}
|
||||
}
|
||||
delete rect;
|
||||
rect = next;
|
||||
|
||||
// Remember that we found a matching rect in this band
|
||||
foundMatchingRect = PR_TRUE;
|
||||
// We don't need to try and coalesce adjacent rects in this case
|
||||
prevRect = nsnull;
|
||||
prevIsSharedRect = PR_FALSE;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// We need to try and coalesce adjacent rects iff we find a shared rect
|
||||
// occupied by aFrame. If either this rect or the previous rect was
|
||||
// shared and occupied by aFrame, then try and coalesce this rect and
|
||||
// the previous rect
|
||||
// If we found a shared rect occupied by aFrame, then we need to try
|
||||
// and coalesce adjacent rects
|
||||
if (prevIsSharedRect || (isSharedRect && (nsnull != prevRect))) {
|
||||
NS_ASSERTION(nsnull != prevRect, "no previous rect");
|
||||
if ((prevRect->right == rect->left) && (prevRect->HasSameFrameList(rect))) {
|
||||
// Modify the current rect's left edge, and delete the previous rect
|
||||
rect->left = prevRect->left;
|
||||
prevRect->Remove();
|
||||
if (prevRect == band) {
|
||||
// the rect we're deleting is the start of the band
|
||||
band = rect;
|
||||
}
|
||||
delete prevRect;
|
||||
}
|
||||
}
|
||||
|
|
@ -829,25 +847,22 @@ PRBool SpaceManager::RemoveRegion(nsIFrame* aFrame)
|
|||
prevRect = rect;
|
||||
prevIsSharedRect = isSharedRect;
|
||||
rect = rect->Next();
|
||||
|
||||
if (rect == &mBandList) {
|
||||
// No bands left
|
||||
rect = nsnull;
|
||||
break;
|
||||
}
|
||||
} while (rect->top == topOfBand);
|
||||
|
||||
// If we found a matching rect in this band or the previous band then try
|
||||
// join the two bands
|
||||
if (prevFoundMatchingRect || (foundMatchingRect && (nsnull != prevBand))) {
|
||||
// Try and join this band with the previous band
|
||||
NS_ASSERTION(nsnull != prevBand, "no previous band");
|
||||
JoinBands(band, prevBand);
|
||||
if (nsnull != band) {
|
||||
// If we found a rect occupied by aFrame in this band or the previous band
|
||||
// then try to join the two bands
|
||||
if (prevFoundMatchingRect || (foundMatchingRect && (nsnull != prevBand))) {
|
||||
// Try and join this band with the previous band
|
||||
NS_ASSERTION(nsnull != prevBand, "no previous band");
|
||||
JoinBands(band, prevBand);
|
||||
}
|
||||
}
|
||||
|
||||
// Move to the next band
|
||||
prevFoundMatchingRect = foundMatchingRect;
|
||||
band = rect;
|
||||
prevBand = band;
|
||||
band = (rect == &mBandList) ? nsnull : rect;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -888,7 +903,7 @@ SpaceManager::FrameInfo* SpaceManager::CreateFrameInfo(nsIFrame* aFrame,
|
|||
|
||||
void SpaceManager::DestroyFrameInfo(FrameInfo* aFrameInfo)
|
||||
{
|
||||
PL_HashTableRemove(mFrameInfoMap, (const void*)aFrameInfo);
|
||||
PL_HashTableRemove(mFrameInfoMap, (const void*)aFrameInfo->frame);
|
||||
delete aFrameInfo;
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче