corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 465928 followup: correct typo in enum name - s/PERSERVE/PRESERVE/. No functional changes. r=roc

Browse Source
This commit is contained in:
Daniel Holbert
2009-01-13 12:28:28 -08:00
parent eb2bb1a6fa
commit 8c965d4b9d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
layout/generic/nsBlockFrame.cpp
View File

@@ -4226,7 +4226,7 @@ nsBlockFrame::HandleOverflowPlaceholdersForPulledFrame(
#ifdef DEBUG #ifdef DEBUG
nsresult rv = nsresult rv =
#endif #endif
parent->DoRemoveFrame(frame, PERSERVE_REMOVED_FRAMES); parent->DoRemoveFrame(frame, PRESERVE_REMOVED_FRAMES);
NS_ASSERTION(NS_SUCCEEDED(rv), "frame should be in parent's lists"); NS_ASSERTION(NS_SUCCEEDED(rv), "frame should be in parent's lists");
nsIFrame* lastOverflowPlace = aState.mOverflowPlaceholders.LastChild(); nsIFrame* lastOverflowPlace = aState.mOverflowPlaceholders.LastChild();
@@ -5262,7 +5262,7 @@ static nsresult RemoveBlockChild(nsIFrame* aFrame, PRBool aDestroyFrames,
NS_ASSERTION(nextBlock, NS_ASSERTION(nextBlock,
"Our child's continuation's parent is not a block?"); "Our child's continuation's parent is not a block?");
return nextBlock->DoRemoveFrame(aFrame, return nextBlock->DoRemoveFrame(aFrame,
(aDestroyFrames ? 0 : nsBlockFrame::PERSERVE_REMOVED_FRAMES) | (aDestroyFrames ? 0 : nsBlockFrame::PRESERVE_REMOVED_FRAMES) |
(aRemoveOnlyFluidContinuations ? 0 : nsBlockFrame::REMOVE_FIXED_CONTINUATIONS)); (aRemoveOnlyFluidContinuations ? 0 : nsBlockFrame::REMOVE_FIXED_CONTINUATIONS));
} }
@@ -5281,7 +5281,7 @@ nsBlockFrame::DoRemoveFrame(nsIFrame* aDeletedFrame, PRUint32 aFlags)
nsPresContext* presContext = PresContext(); nsPresContext* presContext = PresContext();
if (NS_FRAME_IS_OVERFLOW_CONTAINER & aDeletedFrame->GetStateBits()) { if (NS_FRAME_IS_OVERFLOW_CONTAINER & aDeletedFrame->GetStateBits()) {
if (!(aFlags & PERSERVE_REMOVED_FRAMES)) { if (!(aFlags & PRESERVE_REMOVED_FRAMES)) {
nsIFrame* nif = aDeletedFrame->GetNextInFlow(); nsIFrame* nif = aDeletedFrame->GetNextInFlow();
if (nif) if (nif)
static_cast<nsContainerFrame*>(nif->GetParent()) static_cast<nsContainerFrame*>(nif->GetParent())
@@ -5303,7 +5303,7 @@ nsBlockFrame::DoRemoveFrame(nsIFrame* aDeletedFrame, PRUint32 aFlags)
} }
if (aDeletedFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) { if (aDeletedFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
NS_ASSERTION(!(aFlags & PERSERVE_REMOVED_FRAMES), NS_ASSERTION(!(aFlags & PRESERVE_REMOVED_FRAMES),
"We can't not destroy out of flows"); "We can't not destroy out of flows");
DoRemoveOutOfFlowFrame(aDeletedFrame); DoRemoveOutOfFlowFrame(aDeletedFrame);
return NS_OK; return NS_OK;
@@ -5316,12 +5316,12 @@ nsBlockFrame::DoRemoveFrame(nsIFrame* aDeletedFrame, PRUint32 aFlags)
nsFrameList* overflowPlaceholders = GetOverflowPlaceholders(); nsFrameList* overflowPlaceholders = GetOverflowPlaceholders();
if (overflowPlaceholders && overflowPlaceholders->RemoveFrame(aDeletedFrame)) { if (overflowPlaceholders && overflowPlaceholders->RemoveFrame(aDeletedFrame)) {
nsIFrame* nif = aDeletedFrame->GetNextInFlow(); nsIFrame* nif = aDeletedFrame->GetNextInFlow();
if (!(aFlags & PERSERVE_REMOVED_FRAMES)) { if (!(aFlags & PRESERVE_REMOVED_FRAMES)) {
aDeletedFrame->Destroy(); aDeletedFrame->Destroy();
} else { } else {
aDeletedFrame->SetNextSibling(nsnull); aDeletedFrame->SetNextSibling(nsnull);
} }
return RemoveBlockChild(nif, !(aFlags & PERSERVE_REMOVED_FRAMES), return RemoveBlockChild(nif, !(aFlags & PRESERVE_REMOVED_FRAMES),
!(aFlags & REMOVE_FIXED_CONTINUATIONS)); !(aFlags & REMOVE_FIXED_CONTINUATIONS));
} }
} }
@@ -5426,7 +5426,7 @@ found_frame:;
printf(" prevSibling=%p deletedNextContinuation=%p\n", prevSibling, deletedNextContinuation); printf(" prevSibling=%p deletedNextContinuation=%p\n", prevSibling, deletedNextContinuation);
#endif #endif
if (aFlags & PERSERVE_REMOVED_FRAMES) { if (aFlags & PRESERVE_REMOVED_FRAMES) {
aDeletedFrame->SetNextSibling(nsnull); aDeletedFrame->SetNextSibling(nsnull);
} else { } else {
aDeletedFrame->Destroy(); aDeletedFrame->Destroy();
@@ -5487,7 +5487,7 @@ found_frame:;
// consecutive lines. So for placeholders, just continue the slow easy way. // consecutive lines. So for placeholders, just continue the slow easy way.
if (isPlaceholder) { if (isPlaceholder) {
return RemoveBlockChild(deletedNextContinuation, return RemoveBlockChild(deletedNextContinuation,
!(aFlags & PERSERVE_REMOVED_FRAMES), !(aFlags & PRESERVE_REMOVED_FRAMES),
!(aFlags & REMOVE_FIXED_CONTINUATIONS)); !(aFlags & REMOVE_FIXED_CONTINUATIONS));
} }
@@ -5537,7 +5537,7 @@ found_frame:;
#endif #endif
// Advance to next flow block if the frame has more continuations // Advance to next flow block if the frame has more continuations
return RemoveBlockChild(aDeletedFrame, !(aFlags & PERSERVE_REMOVED_FRAMES), return RemoveBlockChild(aDeletedFrame, !(aFlags & PRESERVE_REMOVED_FRAMES),
!(aFlags & REMOVE_FIXED_CONTINUATIONS)); !(aFlags & REMOVE_FIXED_CONTINUATIONS));
} }

2
layout/generic/nsBlockFrame.h
View File

@@ -425,7 +425,7 @@ public:
* don't use it for out of flows. * don't use it for out of flows.
*/ */
enum { enum {
PERSERVE_REMOVED_FRAMES = 0x01, PRESERVE_REMOVED_FRAMES = 0x01,
REMOVE_FIXED_CONTINUATIONS = 0x02, REMOVE_FIXED_CONTINUATIONS = 0x02,
FRAMES_ARE_EMPTY = 0x04 FRAMES_ARE_EMPTY = 0x04
}; };