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

Backing out my checkin from yesterday. b=199673

Browse Source
This commit is contained in:
dbaron@dbaron.org
2004-03-10 17:13:39 +00:00
parent 1c173ceb2f
commit 1eabe65556
6 changed files with 20 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsInlineFrame.cpp
View File

@@ -167,11 +167,7 @@ nsInlineFrame::IsEmpty()
!IsMarginZero(margin->mMargin.GetRightUnit(),
margin->mMargin.GetRight(coord)) ||
!IsMarginZero(margin->mMargin.GetLeftUnit(),
margin->mMargin.GetLeft(coord)) ||
// do we have any standards-mode text decorations?
(GetPresContext()->CompatibilityMode() != eCompatibility_NavQuirks &&
(GetStyleTextReset()->mTextDecoration &
NS_STYLE_TEXT_DECORATION_LINES_MASK) != 0)) {
margin->mMargin.GetLeft(coord))) {
return PR_FALSE;
}

25
layout/generic/nsLineLayout.cpp
View File

@@ -161,7 +161,6 @@ nsLineLayout::nsLineLayout(nsIPresContext* aPresContext,
// Stash away some style data that we need
mStyleText = aOuterReflowState->frame->GetStyleText();
mStyleTextReset = aOuterReflowState->frame->GetStyleTextReset();
mTextAlign = mStyleText->mTextAlign;
mLineNumber = 0;
mColumn = 0;
@@ -2038,21 +2037,15 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
// XXXldb If we really have empty continuations, then all these other
// checks don't make sense for them.
if ((emptyContinuation || mCompatMode != eCompatibility_FullStandards) &&
((psd == mRootSpan)
? (mCompatMode == eCompatibility_NavQuirks ||
(mStyleTextReset->mTextDecoration &
NS_STYLE_TEXT_DECORATION_LINES_MASK) == 0)
: ((0 == spanFramePFD->mBorderPadding.top) &&
(0 == spanFramePFD->mBorderPadding.right) &&
(0 == spanFramePFD->mBorderPadding.bottom) &&
(0 == spanFramePFD->mBorderPadding.left) &&
(0 == spanFramePFD->mMargin.top) &&
(0 == spanFramePFD->mMargin.right) &&
(0 == spanFramePFD->mMargin.bottom) &&
(0 == spanFramePFD->mMargin.left) &&
(mCompatMode == eCompatibility_NavQuirks ||
(spanFrame->GetStyleTextReset()->mTextDecoration &
NS_STYLE_TEXT_DECORATION_LINES_MASK) == 0)))) {
((psd == mRootSpan) ||
((0 == spanFramePFD->mBorderPadding.top) &&
(0 == spanFramePFD->mBorderPadding.right) &&
(0 == spanFramePFD->mBorderPadding.bottom) &&
(0 == spanFramePFD->mBorderPadding.left) &&
(0 == spanFramePFD->mMargin.top) &&
(0 == spanFramePFD->mMargin.right) &&
(0 == spanFramePFD->mMargin.bottom) &&
(0 == spanFramePFD->mMargin.left)))) {
// This code handles an issue with compatability with non-css
// conformant browsers. In particular, there are some cases
// where the font-size and line-height for a span must be

1
layout/generic/nsLineLayout.h
View File

@@ -267,7 +267,6 @@ protected:
// This state is constant for a given block frame doing line layout
nsSpaceManager* mSpaceManager;
const nsStyleText* mStyleText; // for the block
const nsStyleTextReset* mStyleTextReset; // for the block
const nsHTMLReflowState* mBlockReflowState;
// XXX remove this when landing bug 154892 (splitting absolute positioned frames)

6
layout/html/base/src/nsInlineFrame.cpp
View File

@@ -167,11 +167,7 @@ nsInlineFrame::IsEmpty()
!IsMarginZero(margin->mMargin.GetRightUnit(),
margin->mMargin.GetRight(coord)) ||
!IsMarginZero(margin->mMargin.GetLeftUnit(),
margin->mMargin.GetLeft(coord)) ||
// do we have any standards-mode text decorations?
(GetPresContext()->CompatibilityMode() != eCompatibility_NavQuirks &&
(GetStyleTextReset()->mTextDecoration &
NS_STYLE_TEXT_DECORATION_LINES_MASK) != 0)) {
margin->mMargin.GetLeft(coord))) {
return PR_FALSE;
}

25
layout/html/base/src/nsLineLayout.cpp
View File

@@ -161,7 +161,6 @@ nsLineLayout::nsLineLayout(nsIPresContext* aPresContext,
// Stash away some style data that we need
mStyleText = aOuterReflowState->frame->GetStyleText();
mStyleTextReset = aOuterReflowState->frame->GetStyleTextReset();
mTextAlign = mStyleText->mTextAlign;
mLineNumber = 0;
mColumn = 0;
@@ -2038,21 +2037,15 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
// XXXldb If we really have empty continuations, then all these other
// checks don't make sense for them.
if ((emptyContinuation || mCompatMode != eCompatibility_FullStandards) &&
((psd == mRootSpan)
? (mCompatMode == eCompatibility_NavQuirks ||
(mStyleTextReset->mTextDecoration &
NS_STYLE_TEXT_DECORATION_LINES_MASK) == 0)
: ((0 == spanFramePFD->mBorderPadding.top) &&
(0 == spanFramePFD->mBorderPadding.right) &&
(0 == spanFramePFD->mBorderPadding.bottom) &&
(0 == spanFramePFD->mBorderPadding.left) &&
(0 == spanFramePFD->mMargin.top) &&
(0 == spanFramePFD->mMargin.right) &&
(0 == spanFramePFD->mMargin.bottom) &&
(0 == spanFramePFD->mMargin.left) &&
(mCompatMode == eCompatibility_NavQuirks ||
(spanFrame->GetStyleTextReset()->mTextDecoration &
NS_STYLE_TEXT_DECORATION_LINES_MASK) == 0)))) {
((psd == mRootSpan) ||
((0 == spanFramePFD->mBorderPadding.top) &&
(0 == spanFramePFD->mBorderPadding.right) &&
(0 == spanFramePFD->mBorderPadding.bottom) &&
(0 == spanFramePFD->mBorderPadding.left) &&
(0 == spanFramePFD->mMargin.top) &&
(0 == spanFramePFD->mMargin.right) &&
(0 == spanFramePFD->mMargin.bottom) &&
(0 == spanFramePFD->mMargin.left)))) {
// This code handles an issue with compatability with non-css
// conformant browsers. In particular, there are some cases
// where the font-size and line-height for a span must be

1
layout/html/base/src/nsLineLayout.h
View File

@@ -267,7 +267,6 @@ protected:
// This state is constant for a given block frame doing line layout
nsSpaceManager* mSpaceManager;
const nsStyleText* mStyleText; // for the block
const nsStyleTextReset* mStyleTextReset; // for the block
const nsHTMLReflowState* mBlockReflowState;
// XXX remove this when landing bug 154892 (splitting absolute positioned frames)