зеркало из https://github.com/mozilla/pjs.git
Remove PerFrameData::mFrameType, since it's write-only. (Bug 478899) r+sr=bzbarsky
This commit is contained in:
Родитель
038026b7b5
Коммит
86ede9566c
|
@ -789,7 +789,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
|
|||
pfd->mFrame = aFrame;
|
||||
pfd->mMargin = reflowState.mComputedMargin;
|
||||
pfd->mBorderPadding = reflowState.mComputedBorderPadding;
|
||||
pfd->mFrameType = reflowState.mFrameType;
|
||||
pfd->SetFlag(PFD_RELATIVEPOS,
|
||||
(reflowState.mStyleDisplay->mPosition == NS_STYLE_POSITION_RELATIVE));
|
||||
if (pfd->GetFlag(PFD_RELATIVEPOS)) {
|
||||
|
@ -1334,7 +1333,6 @@ nsLineLayout::AddBulletFrame(nsIFrame* aFrame,
|
|||
pfd->mFrame = aFrame;
|
||||
pfd->mMargin.SizeTo(0, 0, 0, 0);
|
||||
pfd->mBorderPadding.SizeTo(0, 0, 0, 0);
|
||||
pfd->mFrameType = NS_FRAME_REPLACED(NS_CSS_FRAME_TYPE_INLINE);
|
||||
pfd->mFlags = 0; // all flags default to false
|
||||
pfd->SetFlag(PFD_ISBULLET, PR_TRUE);
|
||||
if (aMetrics.ascent == nsHTMLReflowMetrics::ASK_FOR_BASELINE)
|
||||
|
@ -1380,7 +1378,6 @@ nsLineLayout::VerticalAlignLine()
|
|||
// Synthesize a PerFrameData for the block frame
|
||||
PerFrameData rootPFD;
|
||||
rootPFD.mFrame = mBlockReflowState->frame;
|
||||
rootPFD.mFrameType = mBlockReflowState->mFrameType;
|
||||
rootPFD.mAscent = 0;
|
||||
mRootSpan->mFrame = &rootPFD;
|
||||
|
||||
|
|
|
@ -443,9 +443,8 @@ protected:
|
|||
// pointer to child span data if this is an inline container frame
|
||||
PerSpanData* mSpan;
|
||||
|
||||
// The frame and its type
|
||||
// The frame
|
||||
nsIFrame* mFrame;
|
||||
nsCSSFrameType mFrameType;
|
||||
|
||||
// From metrics
|
||||
nscoord mAscent;
|
||||
|
|
Загрузка…
Ссылка в новой задаче