зеркало из https://github.com/mozilla/gecko-dev.git
Bug 864289 - Rename nsLineLayout::GetLineContainer(Frame|RS) to LineContainer\1. r=dholbert
This commit is contained in:
Родитель
84bf3ea85d
Коммит
d3f6368233
|
@ -194,7 +194,7 @@ nsFirstLetterFrame::Reflow(nsPresContext* aPresContext,
|
|||
// because the block frame could be split by hard line breaks into
|
||||
// multiple paragraphs with different base direction
|
||||
uint8_t direction;
|
||||
nsIFrame* containerFrame = ll.GetLineContainerFrame();
|
||||
nsIFrame* containerFrame = ll.LineContainerFrame();
|
||||
if (containerFrame->StyleTextReset()->mUnicodeBidi &
|
||||
NS_STYLE_UNICODE_BIDI_PLAINTEXT) {
|
||||
FramePropertyTable *propTable = aPresContext->PropertyTable();
|
||||
|
|
|
@ -309,7 +309,7 @@ nsInlineFrame::Reflow(nsPresContext* aPresContext,
|
|||
|
||||
bool lazilySetParentPointer = false;
|
||||
|
||||
nsIFrame* lineContainer = aReflowState.mLineLayout->GetLineContainerFrame();
|
||||
nsIFrame* lineContainer = aReflowState.mLineLayout->LineContainerFrame();
|
||||
|
||||
// Check for an overflow list with our prev-in-flow
|
||||
nsInlineFrame* prevInFlow = (nsInlineFrame*)GetPrevInFlow();
|
||||
|
@ -976,7 +976,7 @@ nsFirstLineFrame::Reflow(nsPresContext* aPresContext,
|
|||
return NS_ERROR_INVALID_ARG;
|
||||
}
|
||||
|
||||
nsIFrame* lineContainer = aReflowState.mLineLayout->GetLineContainerFrame();
|
||||
nsIFrame* lineContainer = aReflowState.mLineLayout->LineContainerFrame();
|
||||
|
||||
// Check for an overflow list with our prev-in-flow
|
||||
nsFirstLineFrame* prevInFlow = (nsFirstLineFrame*)GetPrevInFlow();
|
||||
|
|
|
@ -80,6 +80,7 @@ nsLineLayout::nsLineLayout(nsPresContext* aPresContext,
|
|||
mDirtyNextLine(false),
|
||||
mLineAtStart(false)
|
||||
{
|
||||
MOZ_ASSERT(aOuterReflowState, "aOuterReflowState must not be null");
|
||||
NS_ASSERTION(aFloatManager || aOuterReflowState->frame->GetType() ==
|
||||
nsGkAtoms::letterFrame,
|
||||
"float manager should be present");
|
||||
|
@ -188,14 +189,14 @@ nsLineLayout::BeginLineReflow(nscoord aX, nscoord aY,
|
|||
|
||||
// If we're in a constrained height frame, then we don't allow a
|
||||
// max line box width to take effect.
|
||||
if (!(GetLineContainerFrame()->GetStateBits() &
|
||||
NS_FRAME_IN_CONSTRAINED_HEIGHT)) {
|
||||
if (!(LineContainerFrame()->GetStateBits() &
|
||||
NS_FRAME_IN_CONSTRAINED_HEIGHT)) {
|
||||
|
||||
// If the available size is greater than the maximum line box width (if
|
||||
// specified), then we need to adjust the line box width to be at the max
|
||||
// possible width.
|
||||
nscoord maxLineBoxWidth =
|
||||
GetLineContainerFrame()->PresContext()->PresShell()->MaxLineBoxWidth();
|
||||
LineContainerFrame()->PresContext()->PresShell()->MaxLineBoxWidth();
|
||||
|
||||
if (maxLineBoxWidth > 0 &&
|
||||
psd->mRightEdge - psd->mLeftEdge > maxLineBoxWidth) {
|
||||
|
@ -205,7 +206,7 @@ nsLineLayout::BeginLineReflow(nscoord aX, nscoord aY,
|
|||
|
||||
mTopEdge = aY;
|
||||
|
||||
psd->mNoWrap = !mStyleText->WhiteSpaceCanWrap(GetLineContainerFrame());
|
||||
psd->mNoWrap = !mStyleText->WhiteSpaceCanWrap(LineContainerFrame());
|
||||
psd->mDirection = aDirection;
|
||||
psd->mChangedFrameDirection = false;
|
||||
|
||||
|
|
|
@ -292,10 +292,8 @@ public:
|
|||
* some other kind of frame when inline frames are reflowed in a non-block
|
||||
* context (e.g. MathML or floating first-letter).
|
||||
*/
|
||||
nsIFrame* GetLineContainerFrame() const { return mBlockReflowState->frame; }
|
||||
const nsHTMLReflowState* GetLineContainerRS() const {
|
||||
return mBlockReflowState;
|
||||
}
|
||||
nsIFrame* LineContainerFrame() const { return mBlockReflowState->frame; }
|
||||
const nsHTMLReflowState* LineContainerRS() const { return mBlockReflowState; }
|
||||
const nsLineList::iterator* GetLine() const {
|
||||
return mGotLineBox ? &mLineBox : nullptr;
|
||||
}
|
||||
|
|
|
@ -7533,7 +7533,7 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
|
|||
}
|
||||
|
||||
uint32_t flowEndInTextRun;
|
||||
nsIFrame* lineContainer = aLineLayout.GetLineContainerFrame();
|
||||
nsIFrame* lineContainer = aLineLayout.LineContainerFrame();
|
||||
gfxContext* ctx = aRenderingContext->ThebesContext();
|
||||
const nsTextFragment* frag = mContent->GetText();
|
||||
|
||||
|
@ -7884,7 +7884,7 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
|
|||
// When we have text decorations, we don't need to compute their overflow now
|
||||
// because we're guaranteed to do it later
|
||||
// (see nsLineLayout::RelativePositionFrames)
|
||||
UnionAdditionalOverflow(presContext, *aLineLayout.GetLineContainerRS(),
|
||||
UnionAdditionalOverflow(presContext, *aLineLayout.LineContainerRS(),
|
||||
provider, &aMetrics.VisualOverflow(), false);
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
|
Загрузка…
Ссылка в новой задаче