mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 383551. Clean up IsInlineFrame, nsStyleDisplay::IsBlockLevel and related methods. r+sr=dbaron

This commit is contained in:
roc+@cs.cmu.edu 2007-06-26 19:31:35 -07:00
Родитель 936757bb95
Коммит 8f9197e293
9 изменённых файлов: 31 добавлений и 92 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
layout/base/nsBidiPresUtils.cpp
Просмотреть файл

@ -475,7 +475,7 @@ PRBool IsBidiLeaf(nsIFrame* aFrame) {
// always of type eBidiInlineContainer, even if it's floating.
return !kid
|| !aFrame->IsFrameOfType(nsIFrame::eBidiInlineContainer)
|| aFrame->GetStyleDisplay()->IsBlockLevel();
|| aFrame->GetStyleDisplay()->IsBlockOutside();
}
nsresult

70
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -532,31 +532,16 @@ GetIBContainingBlockFor(nsIFrame* aFrame)
//----------------------------------------------------------------------
// XXX this predicate and its cousins need to migrated to a single
// place in layout - something in nsStyleDisplay maybe?
static PRBool
IsInlineFrame(nsIFrame* aFrame)
IsInlineOutside(nsIFrame* aFrame)
{
// XXXwaterson why don't we use |! display->IsBlockLevel()| here?
switch (aFrame->GetStyleDisplay()->mDisplay) {
case NS_STYLE_DISPLAY_INLINE:
case NS_STYLE_DISPLAY_INLINE_BLOCK:
case NS_STYLE_DISPLAY_INLINE_TABLE:
case NS_STYLE_DISPLAY_INLINE_BOX:
case NS_STYLE_DISPLAY_INLINE_GRID:
case NS_STYLE_DISPLAY_INLINE_STACK:
return PR_TRUE;
default:
break;
}
return PR_FALSE;
return aFrame->GetStyleDisplay()->IsInlineOutside();
}
// NeedSpecialFrameReframe uses this until we decide what to do about IsInlineFrame() above
static PRBool
IsInlineFrame2(nsIFrame* aFrame)
IsBlockOutside(nsIFrame* aFrame)
{
return !aFrame->GetStyleDisplay()->IsBlockLevel();
return aFrame->GetStyleDisplay()->IsBlockOutside();
}
//----------------------------------------------------------------------
@ -569,23 +554,12 @@ IsInlineFrame2(nsIFrame* aFrame)
// child then the block child is migrated upward until it lands in a block
// parent (the inline frames containing block is where it will end up).
// XXX consolidate these things
static PRBool
IsBlockFrame(nsIFrame* aFrame)
{
// XXXwaterson this seems wrong; see IsInlineFrame() immediately
// above, which will treat inline-block (e.g.) as an inline. Why
// don't we use display->IsBlockLevel() here?
const nsStyleDisplay* display = aFrame->GetStyleDisplay();
return NS_STYLE_DISPLAY_INLINE != display->mDisplay;
}
static nsIFrame*
FindFirstBlock(nsIFrame* aKid, nsIFrame** aPrevKid)
{
nsIFrame* prevKid = nsnull;
while (aKid) {
if (IsBlockFrame(aKid)) {
if (!IsInlineOutside(aKid)) {
*aPrevKid = prevKid;
return aKid;
}
@ -601,7 +575,7 @@ FindLastBlock(nsIFrame* aKid)
{
nsIFrame* lastBlock = nsnull;
while (aKid) {
if (IsBlockFrame(aKid)) {
if (!IsInlineOutside(aKid)) {
lastBlock = aKid;
}
aKid = aKid->GetNextSibling();
@ -4818,7 +4792,7 @@ nsCSSFrameConstructor::ConstructButtonFrame(nsFrameConstructorState& aState,
}
rv = ProcessChildren(aState, aContent, areaFrame, PR_TRUE, childItems,
buttonFrame->GetStyleDisplay()->IsBlockLevel());
buttonFrame->GetStyleDisplay()->IsBlockOutside());
if (NS_FAILED(rv)) return rv;
// Set the areas frame's initial child lists
@ -6323,7 +6297,7 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsFrameConstructorState& aSta
// block-level.
NS_ASSERTION(!(aDisplay->IsFloating() ||
aDisplay->IsAbsolutelyPositioned()) ||
aDisplay->IsBlockLevel(),
aDisplay->IsBlockOutside(),
"Style system did not apply CSS2.1 section 9.7 fixups");
// If this is "body", try propagating its scroll style to the viewport
@ -8462,7 +8436,7 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
styleContext = ResolveStyleContext(parentFrame, child);
// XXX since the block child goes in the last inline of the sacred triad, frames would
// need to be moved into the 2nd triad (block) but that is more work, for now bail.
needReframe = styleContext->GetStyleDisplay()->IsBlockLevel();
needReframe = styleContext->GetStyleDisplay()->IsBlockOutside();
}
if (needReframe)
return ReframeContainingBlock(parentFrame);
@ -8639,7 +8613,7 @@ nsCSSFrameConstructor::NeedSpecialFrameReframe(nsIContent* aParent1,
{
// XXXbz aNextSibling is utterly unused. Why?
if (!IsInlineFrame2(aParentFrame))
if (IsBlockOutside(aParentFrame))
return PR_FALSE;
// find out if aChild is a block or inline
@ -8648,7 +8622,7 @@ nsCSSFrameConstructor::NeedSpecialFrameReframe(nsIContent* aParent1,
nsRefPtr<nsStyleContext> styleContext;
styleContext = ResolveStyleContext(aParentFrame, aChild);
const nsStyleDisplay* display = styleContext->GetStyleDisplay();
childIsBlock = display->IsBlockLevel();
childIsBlock = display->IsBlockOutside();
}
nsIFrame* prevParent; // parent of prev sibling
nsIFrame* nextParent; // parent of next sibling
@ -8657,7 +8631,7 @@ nsCSSFrameConstructor::NeedSpecialFrameReframe(nsIContent* aParent1,
if (aPrevSibling) {
prevParent = aPrevSibling->GetParent();
NS_ASSERTION(prevParent, "program error - null parent frame");
if (IsInlineFrame2(prevParent)) { // prevParent is an inline
if (!IsBlockOutside(prevParent)) { // prevParent is an inline
// XXX we need to find out if prevParent is the 1st inline or the last. If it
// is the 1st, then aChild and the frames after aPrevSibling within the 1st inline
// need to be moved to the block(inline). If it is the last, then aChild and the
@ -8678,7 +8652,7 @@ nsCSSFrameConstructor::NeedSpecialFrameReframe(nsIContent* aParent1,
if (nextSibling) {
nextParent = nextSibling->GetParent();
NS_ASSERTION(nextParent, "program error - null parent frame");
if (IsInlineFrame2(nextParent)) {
if (!IsBlockOutside(nextParent)) {
// XXX we need to move aChild, aNextSibling and all the frames after aNextSibling within
// the 1st inline to the block(inline).
return PR_TRUE; // for now, bail
@ -8692,7 +8666,7 @@ nsCSSFrameConstructor::NeedSpecialFrameReframe(nsIContent* aParent1,
if (aPrevSibling) {
prevParent = aPrevSibling->GetParent();
NS_ASSERTION(prevParent, "program error - null parent frame");
if (IsInlineFrame2(prevParent)) { // prevParent is an inline
if (!IsBlockOutside(prevParent)) { // prevParent is an inline
// aChild goes into the same inline frame as aPrevSibling
aParentFrame = aPrevSibling->GetParent();
NS_ASSERTION(aParentFrame, "program error - null parent frame");
@ -8710,7 +8684,7 @@ nsCSSFrameConstructor::NeedSpecialFrameReframe(nsIContent* aParent1,
if (nextSibling) {
nextParent = nextSibling->GetParent();
NS_ASSERTION(nextParent, "program error - null parent frame");
if (IsInlineFrame2(nextParent)) {
if (!IsBlockOutside(nextParent)) {
// nextParent is the ending inline frame. Put aChild there and
// set aPrevSibling to null so aChild is its first element.
aParentFrame = nextSibling->GetParent();
@ -11102,7 +11076,7 @@ nsCSSFrameConstructor::RecreateFramesForContent(nsIContent* aContent)
// possibly have caused the splitting, and if the inline is changing to a
// block, any reframing that's needed will happen in ContentInserted.
if (MaybeRecreateContainerForIBSplitterFrame(frame, &rv) ||
(!IsInlineFrame(frame) &&
(!IsInlineOutside(frame) &&
MaybeRecreateContainerForIBSplitterFrame(frame->GetParent(), &rv)))
return rv;
}
@ -11351,7 +11325,7 @@ nsCSSFrameConstructor::WrapFramesInFirstLineFrame(
nsIFrame* firstInlineFrame = nsnull;
nsIFrame* lastInlineFrame = nsnull;
while (kid) {
if (IsInlineFrame(kid)) {
if (IsInlineOutside(kid)) {
if (!firstInlineFrame) firstInlineFrame = kid;
lastInlineFrame = kid;
}
@ -11450,7 +11424,7 @@ nsCSSFrameConstructor::AppendFirstLineFrames(
nsIFrame* firstInlineFrame = nsnull;
nsIFrame* lastInlineFrame = nsnull;
while (kid) {
if (IsInlineFrame(kid)) {
if (IsInlineOutside(kid)) {
if (!firstInlineFrame) firstInlineFrame = kid;
lastInlineFrame = kid;
}
@ -11507,7 +11481,7 @@ nsCSSFrameConstructor::InsertFirstLineFrames(
#if 0
nsIFrame* parentFrame = *aParentFrame;
nsIFrame* newFrame = aFrameItems.childList;
PRBool isInline = IsInlineFrame(newFrame);
PRBool isInline = IsInlineOutside(newFrame);
if (!aPrevSibling) {
// Insertion will become the first frame. Two cases: we either
@ -12389,7 +12363,7 @@ nsCSSFrameConstructor::AreAllKidsInline(nsIFrame* aFrameList)
{
nsIFrame* kid = aFrameList;
while (kid) {
if (!IsInlineFrame(kid)) {
if (!IsInlineOutside(kid)) {
return PR_FALSE;
}
kid = kid->GetNextSibling();
@ -12636,7 +12610,7 @@ nsCSSFrameConstructor::ProcessInlineChildren(nsFrameConstructorState& aState,
kid = aFrameItems.childList;
}
while (kid) {
if (!IsInlineFrame(kid)) {
if (!IsInlineOutside(kid)) {
allKidsInline = PR_FALSE;
break;
}
@ -12756,7 +12730,7 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
// pseudo-frames -- telling which ones are or are not OK to walk out of is
// too hard (and I suspect that we do in fact need to walk out of all of
// them).
while (IsFrameSpecial(aContainingBlock) || IsInlineFrame(aContainingBlock) ||
while (IsFrameSpecial(aContainingBlock) || IsInlineOutside(aContainingBlock) ||
aContainingBlock->GetStyleContext()->GetPseudoType()) {
aContainingBlock = aContainingBlock->GetParent();
NS_ASSERTION(aContainingBlock,

6
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -794,7 +794,7 @@ CalculateContainingBlockSizeForAbsolutes(const nsHTMLReflowState& aReflowState,
if (aLastRS != &aReflowState) {
// The wrapper frame should be block-level. If it isn't, how the
// heck did it end up wrapping this block frame?
NS_ASSERTION(aLastRS->frame->GetStyleDisplay()->IsBlockLevel(),
NS_ASSERTION(aLastRS->frame->GetStyleDisplay()->IsBlockOutside(),
"Wrapping frame should be block-level");
// Scrollbars need to be specifically excluded, if present, because they are outside the
// padding-edge. We need better APIs for getting the various boxes from a frame.
@ -2283,7 +2283,7 @@ nsBlockFrame::PullFrameFrom(nsBlockReflowState& aState,
NS_ABORT_IF_FALSE(fromLine->GetChildCount(), "empty line");
NS_ABORT_IF_FALSE(aLine->GetChildCount(), "empty line");
NS_ASSERTION(fromLine->IsBlock() == fromLine->mFirstChild->GetStyleDisplay()->IsBlockLevel(),
NS_ASSERTION(fromLine->IsBlock() == fromLine->mFirstChild->GetStyleDisplay()->IsBlockOutside(),
"Disagreement about whether it's a block or not");
if (fromLine->IsBlock()) {
@ -4732,7 +4732,7 @@ nsBlockFrame::AddFrames(nsIFrame* aFrameList,
// structures to fit.
nsIFrame* newFrame = aFrameList;
while (newFrame) {
PRBool isBlock = nsLineLayout::TreatFrameAsBlock(newFrame);
PRBool isBlock = newFrame->GetStyleDisplay()->IsBlockOutside();
// If the frame is a block frame, or if there is no previous line or if the
// previous line is a block line we need to make a new line. We also make

2
layout/generic/nsHTMLContainerFrame.cpp
Просмотреть файл

@ -255,7 +255,7 @@ nsHTMLContainerFrame::GetTextDecorations(nsPresContext* aPresContext,
nsStyleContext* styleContext = frame->GetStyleContext();
const nsStyleDisplay* styleDisplay = styleContext->GetStyleDisplay();
if (!styleDisplay->IsBlockLevel() &&
if (!styleDisplay->IsBlockOutside() &&
styleDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL) {
// If an inline frame is discovered while walking up the tree,
// we should stop according to CSS3 draft. CSS2 is rather vague

2
layout/generic/nsLineBox.cpp
Просмотреть файл

@ -67,7 +67,7 @@ nsLineBox::nsLineBox(nsIFrame* aFrame, PRInt32 aCount, PRBool aIsBlock)
NS_ASSERTION(!aIsBlock || aCount == 1, "Blocks must have exactly one child");
nsIFrame* f = aFrame;
for (PRInt32 n = aCount; n > 0; f = f->GetNextSibling(), --n) {
NS_ASSERTION(aIsBlock == f->GetStyleDisplay()->IsBlockLevel(),
NS_ASSERTION(aIsBlock == f->GetStyleDisplay()->IsBlockOutside(),
"wrong kind of child frame");
}
#endif

21
layout/generic/nsLineLayout.cpp
Просмотреть файл

@ -2710,24 +2710,3 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
}
aCombinedArea = combinedAreaResult;
}
PRBool
nsLineLayout::TreatFrameAsBlock(nsIFrame* aFrame)
{
const nsStyleDisplay* display = aFrame->GetStyleDisplay();
if (NS_STYLE_POSITION_ABSOLUTE == display->mPosition) {
return PR_FALSE;
}
if (NS_STYLE_FLOAT_NONE != display->mFloats) {
return PR_FALSE;
}
switch (display->mDisplay) {
case NS_STYLE_DISPLAY_BLOCK:
case NS_STYLE_DISPLAY_LIST_ITEM:
case NS_STYLE_DISPLAY_RUN_IN:
case NS_STYLE_DISPLAY_COMPACT:
case NS_STYLE_DISPLAY_TABLE:
return PR_TRUE;
}
return PR_FALSE;
}

4
layout/generic/nsLineLayout.h
Просмотреть файл

@ -311,10 +311,6 @@ public:
//----------------------------------------
static PRBool TreatFrameAsBlock(nsIFrame* aFrame);
//----------------------------------------
nsPresContext* mPresContext;
/**

5
layout/style/nsRuleNode.cpp
Просмотреть файл

@ -167,7 +167,7 @@ static void EnsureBlockDisplay(PRUint8& display)
case NS_STYLE_DISPLAY_BLOCK :
case NS_STYLE_DISPLAY_LIST_ITEM :
// do not muck with these at all - already blocks
// This is equivalent to nsStyleDisplay::IsBlockLevel. (XXX Maybe we
// This is equivalent to nsStyleDisplay::IsBlockOutside. (XXX Maybe we
// should just call that?)
break;
@ -2922,8 +2922,7 @@ nsRuleNode::ComputeDisplayData(nsStyleStruct* aStartStruct,
displayValue != NS_STYLE_DISPLAY_INLINE &&
displayValue != NS_STYLE_DISPLAY_INLINE_BLOCK) {
inherited = PR_TRUE;
// XXX IsBlockInside? (except for the marker bit)
if (parentDisplay->IsBlockLevel() ||
if (parentDisplay->IsBlockOutside() ||
parentDisplay->mDisplay == NS_STYLE_DISPLAY_INLINE_BLOCK ||
parentDisplay->mDisplay == NS_STYLE_DISPLAY_TABLE_CELL ||
parentDisplay->mDisplay == NS_STYLE_DISPLAY_TABLE_CAPTION) {

11
layout/style/nsStyleStruct.h
Просмотреть файл

@ -783,11 +783,6 @@ struct nsStyleDisplay : public nsStyleStruct {
PRUint8 mOverflowY; // [reset] see nsStyleConsts.h
PRUint8 mClipFlags; // [reset] see nsStyleConsts.h
// XXX Deprecated. Prefer |IsBlockOutside|.
PRBool IsBlockLevel() const {
return IsBlockOutside();
}
PRBool IsBlockInside() const {
return NS_STYLE_DISPLAY_BLOCK == mDisplay ||
NS_STYLE_DISPLAY_LIST_ITEM == mDisplay ||
@ -809,11 +804,7 @@ struct nsStyleDisplay : public nsStyleStruct {
NS_STYLE_DISPLAY_INLINE_TABLE == mDisplay ||
NS_STYLE_DISPLAY_INLINE_BOX == mDisplay ||
NS_STYLE_DISPLAY_INLINE_GRID == mDisplay ||
NS_STYLE_DISPLAY_INLINE_STACK == mDisplay ||
// Are these really inlines? :
NS_STYLE_DISPLAY_DECK == mDisplay ||
NS_STYLE_DISPLAY_POPUP == mDisplay ||
NS_STYLE_DISPLAY_GROUPBOX == mDisplay;
NS_STYLE_DISPLAY_INLINE_STACK == mDisplay;
}
PRBool IsFloating() const {