mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 1286468 - Trim trailing whitspaces in nsBlockFrame.h and nsBlockFrame.cpp. r=TYLin
MozReview-Commit-ID: JDgfzmGcb1J --HG-- extra : rebase_source : 1f4f6dd8a49cfe8ba7829bf09bf20fd06abbc0f5
This commit is contained in:
parent
349eabf2f7
commit
d11d8fe851
@ -98,7 +98,7 @@ static void MarkSameFloatManagerLinesDirty(nsBlockFrame* aBlock)
|
|||||||
}
|
}
|
||||||
blockWithFloatMgr = bf;
|
blockWithFloatMgr = bf;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mark every line at and below the line where the float was
|
// Mark every line at and below the line where the float was
|
||||||
// dirty, and mark their lines dirty too. We could probably do
|
// dirty, and mark their lines dirty too. We could probably do
|
||||||
// something more efficient --- e.g., just dirty the lines that intersect
|
// something more efficient --- e.g., just dirty the lines that intersect
|
||||||
@ -116,7 +116,7 @@ static bool BlockHasAnyFloats(nsIFrame* aFrame)
|
|||||||
return false;
|
return false;
|
||||||
if (block->GetChildList(nsIFrame::kFloatList).FirstChild())
|
if (block->GetChildList(nsIFrame::kFloatList).FirstChild())
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
nsLineList::iterator line = block->BeginLine();
|
nsLineList::iterator line = block->BeginLine();
|
||||||
nsLineList::iterator endLine = block->EndLine();
|
nsLineList::iterator endLine = block->EndLine();
|
||||||
while (line != endLine) {
|
while (line != endLine) {
|
||||||
@ -595,7 +595,7 @@ ReparentFrame(nsIFrame* aFrame, nsContainerFrame* aOldParent,
|
|||||||
// views need to be reparented
|
// views need to be reparented
|
||||||
nsContainerFrame::ReparentFrameView(aFrame, aOldParent, aNewParent);
|
nsContainerFrame::ReparentFrameView(aFrame, aOldParent, aNewParent);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
ReparentFrames(nsFrameList& aFrameList, nsContainerFrame* aOldParent,
|
ReparentFrames(nsFrameList& aFrameList, nsContainerFrame* aOldParent,
|
||||||
nsContainerFrame* aNewParent)
|
nsContainerFrame* aNewParent)
|
||||||
@ -604,7 +604,7 @@ ReparentFrames(nsFrameList& aFrameList, nsContainerFrame* aOldParent,
|
|||||||
ReparentFrame(e.get(), aOldParent, aNewParent);
|
ReparentFrame(e.get(), aOldParent, aNewParent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove the first line from aFromLines and adjust the associated frame list
|
* Remove the first line from aFromLines and adjust the associated frame list
|
||||||
* aFromFrames accordingly. The removed line is assigned to *aOutLine and
|
* aFromFrames accordingly. The removed line is assigned to *aOutLine and
|
||||||
@ -638,7 +638,7 @@ nsBlockFrame::MarkIntrinsicISizesDirty()
|
|||||||
dirtyBlock->mMinWidth = NS_INTRINSIC_WIDTH_UNKNOWN;
|
dirtyBlock->mMinWidth = NS_INTRINSIC_WIDTH_UNKNOWN;
|
||||||
dirtyBlock->mPrefWidth = NS_INTRINSIC_WIDTH_UNKNOWN;
|
dirtyBlock->mPrefWidth = NS_INTRINSIC_WIDTH_UNKNOWN;
|
||||||
if (!(GetStateBits() & NS_BLOCK_NEEDS_BIDI_RESOLUTION)) {
|
if (!(GetStateBits() & NS_BLOCK_NEEDS_BIDI_RESOLUTION)) {
|
||||||
for (nsIFrame* frame = dirtyBlock; frame;
|
for (nsIFrame* frame = dirtyBlock; frame;
|
||||||
frame = frame->GetNextContinuation()) {
|
frame = frame->GetNextContinuation()) {
|
||||||
frame->AddStateBits(NS_BLOCK_NEEDS_BIDI_RESOLUTION);
|
frame->AddStateBits(NS_BLOCK_NEEDS_BIDI_RESOLUTION);
|
||||||
}
|
}
|
||||||
@ -1277,11 +1277,11 @@ nsBlockFrame::Reflow(nsPresContext* aPresContext,
|
|||||||
"empty bullet took up space");
|
"empty bullet took up space");
|
||||||
|
|
||||||
if (havePosition && !BulletIsEmpty()) {
|
if (havePosition && !BulletIsEmpty()) {
|
||||||
// We have some lines to align the bullet with.
|
// We have some lines to align the bullet with.
|
||||||
|
|
||||||
// Doing the alignment using the baseline will also cater for
|
// Doing the alignment using the baseline will also cater for
|
||||||
// bullets that are placed next to a child block (bug 92896)
|
// bullets that are placed next to a child block (bug 92896)
|
||||||
|
|
||||||
// Tall bullets won't look particularly nice here...
|
// Tall bullets won't look particularly nice here...
|
||||||
LogicalRect bbox = bullet->GetLogicalRect(wm, reflowOutput.PhysicalSize());
|
LogicalRect bbox = bullet->GetLogicalRect(wm, reflowOutput.PhysicalSize());
|
||||||
bbox.BStart(wm) = position.mBaseline - reflowOutput.BlockStartAscent();
|
bbox.BStart(wm) = position.mBaseline - reflowOutput.BlockStartAscent();
|
||||||
@ -1933,7 +1933,7 @@ nsBlockFrame::PrepareResizeReflow(BlockReflowInput& aState)
|
|||||||
|
|
||||||
#ifdef REALLY_NOISY_REFLOW
|
#ifdef REALLY_NOISY_REFLOW
|
||||||
if (!line->IsBlock()) {
|
if (!line->IsBlock()) {
|
||||||
printf("PrepareResizeReflow thinks line %p is %simpacted by floats\n",
|
printf("PrepareResizeReflow thinks line %p is %simpacted by floats\n",
|
||||||
line.get(), line->IsImpactedByFloat() ? "" : "not ");
|
line.get(), line->IsImpactedByFloat() ? "" : "not ");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -1995,7 +1995,7 @@ nsBlockFrame::PropagateFloatDamage(BlockReflowInput& aState,
|
|||||||
|
|
||||||
// Check the damage region recorded in the float damage.
|
// Check the damage region recorded in the float damage.
|
||||||
if (floatManager->HasFloatDamage()) {
|
if (floatManager->HasFloatDamage()) {
|
||||||
// Need to check mBounds *and* mCombinedArea to find intersections
|
// Need to check mBounds *and* mCombinedArea to find intersections
|
||||||
// with aLine's floats
|
// with aLine's floats
|
||||||
nscoord lineBCoordBefore = aLine->BStart() + aDeltaBCoord;
|
nscoord lineBCoordBefore = aLine->BStart() + aDeltaBCoord;
|
||||||
nscoord lineBCoordAfter = lineBCoordBefore + aLine->BSize();
|
nscoord lineBCoordAfter = lineBCoordBefore + aLine->BSize();
|
||||||
@ -2035,7 +2035,7 @@ nsBlockFrame::PropagateFloatDamage(BlockReflowInput& aState,
|
|||||||
nullptr);
|
nullptr);
|
||||||
|
|
||||||
#ifdef REALLY_NOISY_REFLOW
|
#ifdef REALLY_NOISY_REFLOW
|
||||||
printf("nsBlockFrame::PropagateFloatDamage %p was = %d, is=%d\n",
|
printf("nsBlockFrame::PropagateFloatDamage %p was = %d, is=%d\n",
|
||||||
this, wasImpactedByFloat, floatAvailableSpace.mHasFloats);
|
this, wasImpactedByFloat, floatAvailableSpace.mHasFloats);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -2501,14 +2501,14 @@ nsBlockFrame::ReflowDirtyLines(BlockReflowInput& aState)
|
|||||||
bool skipPull = willReflowAgain && heightConstrained;
|
bool skipPull = willReflowAgain && heightConstrained;
|
||||||
if (!skipPull && heightConstrained && aState.mNextInFlow &&
|
if (!skipPull && heightConstrained && aState.mNextInFlow &&
|
||||||
(aState.mReflowInput.mFlags.mNextInFlowUntouched &&
|
(aState.mReflowInput.mFlags.mNextInFlowUntouched &&
|
||||||
!lastLineMovedUp &&
|
!lastLineMovedUp &&
|
||||||
!(GetStateBits() & NS_FRAME_IS_DIRTY) &&
|
!(GetStateBits() & NS_FRAME_IS_DIRTY) &&
|
||||||
!reflowedFloat)) {
|
!reflowedFloat)) {
|
||||||
// We'll place lineIter at the last line of this block, so that
|
// We'll place lineIter at the last line of this block, so that
|
||||||
// nsBlockInFlowLineIterator::Next() will take us to the first
|
// nsBlockInFlowLineIterator::Next() will take us to the first
|
||||||
// line of my next-in-flow-chain. (But first, check that I
|
// line of my next-in-flow-chain. (But first, check that I
|
||||||
// have any lines -- if I don't, just bail out of this
|
// have any lines -- if I don't, just bail out of this
|
||||||
// optimization.)
|
// optimization.)
|
||||||
LineIterator lineIter = this->EndLine();
|
LineIterator lineIter = this->EndLine();
|
||||||
if (lineIter != this->BeginLine()) {
|
if (lineIter != this->BeginLine()) {
|
||||||
lineIter--; // I have lines; step back from dummy iterator to last line.
|
lineIter--; // I have lines; step back from dummy iterator to last line.
|
||||||
@ -2516,7 +2516,7 @@ nsBlockFrame::ReflowDirtyLines(BlockReflowInput& aState)
|
|||||||
|
|
||||||
// Check for next-in-flow-chain's first line.
|
// Check for next-in-flow-chain's first line.
|
||||||
// (First, see if there is such a line, and second, see if it's clean)
|
// (First, see if there is such a line, and second, see if it's clean)
|
||||||
if (!bifLineIter.Next() ||
|
if (!bifLineIter.Next() ||
|
||||||
!bifLineIter.GetLine()->IsDirty()) {
|
!bifLineIter.GetLine()->IsDirty()) {
|
||||||
skipPull=true;
|
skipPull=true;
|
||||||
}
|
}
|
||||||
@ -2530,7 +2530,7 @@ nsBlockFrame::ReflowDirtyLines(BlockReflowInput& aState)
|
|||||||
else
|
else
|
||||||
NS_FRAME_SET_INCOMPLETE(aState.mReflowStatus);
|
NS_FRAME_SET_INCOMPLETE(aState.mReflowStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!skipPull && aState.mNextInFlow) {
|
if (!skipPull && aState.mNextInFlow) {
|
||||||
// Pull data from a next-in-flow if there's still room for more
|
// Pull data from a next-in-flow if there's still room for more
|
||||||
// content here.
|
// content here.
|
||||||
@ -2947,7 +2947,7 @@ nsBlockFrame::MoveChildFramesOfLine(nsLineBox* aLine, nscoord aDeltaBCoord)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
nsBlockFrame::AttributeChanged(int32_t aNameSpaceID,
|
nsBlockFrame::AttributeChanged(int32_t aNameSpaceID,
|
||||||
nsIAtom* aAttribute,
|
nsIAtom* aAttribute,
|
||||||
int32_t aModType)
|
int32_t aModType)
|
||||||
@ -3141,8 +3141,8 @@ nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState,
|
|||||||
|
|
||||||
nsIFrame* frame = aLine->mFirstChild;
|
nsIFrame* frame = aLine->mFirstChild;
|
||||||
if (!frame) {
|
if (!frame) {
|
||||||
NS_ASSERTION(false, "program error - unexpected empty line");
|
NS_ASSERTION(false, "program error - unexpected empty line");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare the block reflow engine
|
// Prepare the block reflow engine
|
||||||
@ -3569,21 +3569,21 @@ nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState,
|
|||||||
aLine->SetOverflowAreas(overflowAreas);
|
aLine->SetOverflowAreas(overflowAreas);
|
||||||
if (*aKeepReflowGoing) {
|
if (*aKeepReflowGoing) {
|
||||||
// Some of the child block fit
|
// Some of the child block fit
|
||||||
|
|
||||||
// Advance to new Y position
|
// Advance to new Y position
|
||||||
nscoord newBCoord = aLine->BEnd();
|
nscoord newBCoord = aLine->BEnd();
|
||||||
aState.mBCoord = newBCoord;
|
aState.mBCoord = newBCoord;
|
||||||
|
|
||||||
|
|
||||||
// Continue the block frame now if it didn't completely fit in
|
// Continue the block frame now if it didn't completely fit in
|
||||||
// the available space.
|
// the available space.
|
||||||
if (!NS_FRAME_IS_FULLY_COMPLETE(frameReflowStatus)) {
|
if (!NS_FRAME_IS_FULLY_COMPLETE(frameReflowStatus)) {
|
||||||
bool madeContinuation =
|
bool madeContinuation =
|
||||||
CreateContinuationFor(aState, nullptr, frame);
|
CreateContinuationFor(aState, nullptr, frame);
|
||||||
|
|
||||||
nsIFrame* nextFrame = frame->GetNextInFlow();
|
nsIFrame* nextFrame = frame->GetNextInFlow();
|
||||||
NS_ASSERTION(nextFrame, "We're supposed to have a next-in-flow by now");
|
NS_ASSERTION(nextFrame, "We're supposed to have a next-in-flow by now");
|
||||||
|
|
||||||
if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {
|
if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {
|
||||||
// If nextFrame used to be an overflow container, make it a normal block
|
// If nextFrame used to be an overflow container, make it a normal block
|
||||||
if (!madeContinuation &&
|
if (!madeContinuation &&
|
||||||
@ -3637,7 +3637,7 @@ nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
*aKeepReflowGoing = false;
|
*aKeepReflowGoing = false;
|
||||||
|
|
||||||
// The block-end margin for a block is only applied on the last
|
// The block-end margin for a block is only applied on the last
|
||||||
// flow block. Since we just continued the child block frame,
|
// flow block. Since we just continued the child block frame,
|
||||||
// we know that line->mFirstChild is not the last flow block
|
// we know that line->mFirstChild is not the last flow block
|
||||||
@ -3723,7 +3723,7 @@ nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState,
|
|||||||
if (originalPosition != frame->GetPosition() && !frame->HasView()) {
|
if (originalPosition != frame->GetPosition() && !frame->HasView()) {
|
||||||
nsContainerFrame::PositionChildViews(frame);
|
nsContainerFrame::PositionChildViews(frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
VerifyLines(true);
|
VerifyLines(true);
|
||||||
#endif
|
#endif
|
||||||
@ -4315,7 +4315,7 @@ nsBlockFrame::SplitLine(BlockReflowInput& aState,
|
|||||||
MOZ_ASSERT(aLine->IsInline(), "illegal SplitLine on block line");
|
MOZ_ASSERT(aLine->IsInline(), "illegal SplitLine on block line");
|
||||||
|
|
||||||
int32_t pushCount = aLine->GetChildCount() - aLineLayout.GetCurrentSpanCount();
|
int32_t pushCount = aLine->GetChildCount() - aLineLayout.GetCurrentSpanCount();
|
||||||
MOZ_ASSERT(pushCount >= 0, "bad push count");
|
MOZ_ASSERT(pushCount >= 0, "bad push count");
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (gNoisyReflow) {
|
if (gNoisyReflow) {
|
||||||
@ -4683,7 +4683,7 @@ nsBlockFrame::PushLines(BlockReflowInput& aState,
|
|||||||
// this takes ownership but it won't delete it immediately so we
|
// this takes ownership but it won't delete it immediately so we
|
||||||
// can keep using it.
|
// can keep using it.
|
||||||
SetOverflowLines(overflowLines);
|
SetOverflowLines(overflowLines);
|
||||||
|
|
||||||
// Mark all the overflow lines dirty so that they get reflowed when
|
// Mark all the overflow lines dirty so that they get reflowed when
|
||||||
// they are pulled up by our next-in-flow.
|
// they are pulled up by our next-in-flow.
|
||||||
|
|
||||||
@ -4752,7 +4752,7 @@ nsBlockFrame::DrainOverflowLines()
|
|||||||
}
|
}
|
||||||
// The overflow lines have already been marked dirty and their previous
|
// The overflow lines have already been marked dirty and their previous
|
||||||
// margins marked dirty also.
|
// margins marked dirty also.
|
||||||
|
|
||||||
// Prepend the overflow frames/lines to our principal list.
|
// Prepend the overflow frames/lines to our principal list.
|
||||||
mFrames.InsertFrames(nullptr, nullptr, overflowLines->mFrames);
|
mFrames.InsertFrames(nullptr, nullptr, overflowLines->mFrames);
|
||||||
mLines.splice(mLines.begin(), overflowLines->mLines);
|
mLines.splice(mLines.begin(), overflowLines->mLines);
|
||||||
@ -5229,7 +5229,7 @@ nsBlockFrame::AddFrames(nsFrameList& aFrameList, nsIFrame* aPrevSibling)
|
|||||||
if (!aPrevSibling && HasInsideBullet()) {
|
if (!aPrevSibling && HasInsideBullet()) {
|
||||||
aPrevSibling = GetInsideBullet();
|
aPrevSibling = GetInsideBullet();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Attempt to find the line that contains the previous sibling
|
// Attempt to find the line that contains the previous sibling
|
||||||
nsLineList* lineList = &mLines;
|
nsLineList* lineList = &mLines;
|
||||||
nsFrameList* frames = &mFrames;
|
nsFrameList* frames = &mFrames;
|
||||||
@ -5717,7 +5717,7 @@ nsBlockFrame::DoRemoveFrame(nsIFrame* aDeletedFrame, uint32_t aFlags)
|
|||||||
NS_ERROR("can't find deleted frame in lines");
|
NS_ERROR("can't find deleted frame in lines");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(aFlags & FRAMES_ARE_EMPTY)) {
|
if (!(aFlags & FRAMES_ARE_EMPTY)) {
|
||||||
if (line != line_start) {
|
if (line != line_start) {
|
||||||
line.prev()->MarkDirty();
|
line.prev()->MarkDirty();
|
||||||
@ -5745,7 +5745,7 @@ nsBlockFrame::DoRemoveFrame(nsIFrame* aDeletedFrame, uint32_t aFlags)
|
|||||||
LineIterator next = line.next();
|
LineIterator next = line.next();
|
||||||
nsIFrame* lastFrame = next != line_end ?
|
nsIFrame* lastFrame = next != line_end ?
|
||||||
next->mFirstChild->GetPrevSibling() :
|
next->mFirstChild->GetPrevSibling() :
|
||||||
(searchingOverflowList ? overflowLines->mFrames.LastChild() :
|
(searchingOverflowList ? overflowLines->mFrames.LastChild() :
|
||||||
mFrames.LastChild());
|
mFrames.LastChild());
|
||||||
NS_ASSERTION(next == line_end || lastFrame == line->LastChild(),
|
NS_ASSERTION(next == line_end || lastFrame == line->LastChild(),
|
||||||
"unexpected line frames");
|
"unexpected line frames");
|
||||||
@ -6203,7 +6203,7 @@ nsBlockFrame::ReflowFloat(BlockReflowInput& aState,
|
|||||||
// We never split floating first letters; an incomplete state for
|
// We never split floating first letters; an incomplete state for
|
||||||
// such frames simply means that there is more content to be
|
// such frames simply means that there is more content to be
|
||||||
// reflowed on the line.
|
// reflowed on the line.
|
||||||
if (NS_FRAME_IS_NOT_COMPLETE(aReflowStatus))
|
if (NS_FRAME_IS_NOT_COMPLETE(aReflowStatus))
|
||||||
aReflowStatus = NS_FRAME_COMPLETE;
|
aReflowStatus = NS_FRAME_COMPLETE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6230,7 +6230,7 @@ nsBlockFrame::ReflowFloat(BlockReflowInput& aState,
|
|||||||
metrics.VisualOverflow(),
|
metrics.VisualOverflow(),
|
||||||
NS_FRAME_NO_MOVE_VIEW);
|
NS_FRAME_NO_MOVE_VIEW);
|
||||||
}
|
}
|
||||||
// Pass floatRS so the frame hierarchy can be used (redoFloatRS has the same hierarchy)
|
// Pass floatRS so the frame hierarchy can be used (redoFloatRS has the same hierarchy)
|
||||||
aFloat->DidReflow(aState.mPresContext, &floatRS,
|
aFloat->DidReflow(aState.mPresContext, &floatRS,
|
||||||
nsDidReflowStatus::FINISHED);
|
nsDidReflowStatus::FINISHED);
|
||||||
|
|
||||||
@ -6498,7 +6498,7 @@ DisplayLine(nsDisplayListBuilder* aBuilder, const nsRect& aLineArea,
|
|||||||
childLists, flags);
|
childLists, flags);
|
||||||
kid = kid->GetNextSibling();
|
kid = kid->GetNextSibling();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lineMayHaveTextOverflow) {
|
if (lineMayHaveTextOverflow) {
|
||||||
aTextOverflow->ProcessLine(collection, aLine.get());
|
aTextOverflow->ProcessLine(collection, aLine.get());
|
||||||
}
|
}
|
||||||
@ -6561,7 +6561,7 @@ nsBlockFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
|||||||
nsLineBox* cursor = aBuilder->ShouldDescendIntoFrame(this) ?
|
nsLineBox* cursor = aBuilder->ShouldDescendIntoFrame(this) ?
|
||||||
nullptr : GetFirstLineContaining(aDirtyRect.y);
|
nullptr : GetFirstLineContaining(aDirtyRect.y);
|
||||||
LineIterator line_end = EndLine();
|
LineIterator line_end = EndLine();
|
||||||
|
|
||||||
if (cursor) {
|
if (cursor) {
|
||||||
for (LineIterator line = mLines.begin(cursor);
|
for (LineIterator line = mLines.begin(cursor);
|
||||||
line != line_end;
|
line != line_end;
|
||||||
@ -6661,7 +6661,7 @@ nsBlockFrame::AccessibleType()
|
|||||||
// the nsDocAccessible object created with the document node
|
// the nsDocAccessible object created with the document node
|
||||||
return a11y::eNoType;
|
return a11y::eNoType;
|
||||||
}
|
}
|
||||||
|
|
||||||
nsCOMPtr<nsIDOMHTMLDocument> htmlDoc =
|
nsCOMPtr<nsIDOMHTMLDocument> htmlDoc =
|
||||||
do_QueryInterface(mContent->GetComposedDoc());
|
do_QueryInterface(mContent->GetComposedDoc());
|
||||||
if (htmlDoc) {
|
if (htmlDoc) {
|
||||||
@ -6699,7 +6699,7 @@ void nsBlockFrame::SetupLineCursor()
|
|||||||
|| mLines.empty()) {
|
|| mLines.empty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Properties().Set(LineCursorProperty(), mLines.front());
|
Properties().Set(LineCursorProperty(), mLines.front());
|
||||||
AddStateBits(NS_BLOCK_HAS_LINE_CURSOR);
|
AddStateBits(NS_BLOCK_HAS_LINE_CURSOR);
|
||||||
}
|
}
|
||||||
@ -6711,7 +6711,7 @@ nsLineBox* nsBlockFrame::GetFirstLineContaining(nscoord y)
|
|||||||
}
|
}
|
||||||
|
|
||||||
FrameProperties props = Properties();
|
FrameProperties props = Properties();
|
||||||
|
|
||||||
nsLineBox* property = props.Get(LineCursorProperty());
|
nsLineBox* property = props.Get(LineCursorProperty());
|
||||||
LineIterator cursor = mLines.begin(property);
|
LineIterator cursor = mLines.begin(property);
|
||||||
nsRect cursorArea = cursor->GetVisualOverflowArea();
|
nsRect cursorArea = cursor->GetVisualOverflowArea();
|
||||||
@ -6750,7 +6750,7 @@ nsBlockFrame::ChildIsDirty(nsIFrame* aChild)
|
|||||||
bulletLine != mLines.back()) {
|
bulletLine != mLines.back()) {
|
||||||
bulletLine = bulletLine.next();
|
bulletLine = bulletLine.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bulletLine != EndLine()) {
|
if (bulletLine != EndLine()) {
|
||||||
MarkLineDirty(bulletLine, &mLines);
|
MarkLineDirty(bulletLine, &mLines);
|
||||||
}
|
}
|
||||||
@ -7149,7 +7149,7 @@ nsBlockFrame::CheckFloats(BlockReflowInput& aState)
|
|||||||
anyLineDirty = true;
|
anyLineDirty = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
AutoTArray<nsIFrame*, 8> storedFloats;
|
AutoTArray<nsIFrame*, 8> storedFloats;
|
||||||
bool equal = true;
|
bool equal = true;
|
||||||
uint32_t i = 0;
|
uint32_t i = 0;
|
||||||
@ -7277,7 +7277,7 @@ nsBlockFrame::ISizeToClearPastFloats(const BlockReflowInput& aState,
|
|||||||
result.marginIStart = computedMargin.IStart(wm);
|
result.marginIStart = computedMargin.IStart(wm);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
nsBlockFrame*
|
nsBlockFrame*
|
||||||
nsBlockFrame::GetNearestAncestorBlock(nsIFrame* aCandidate)
|
nsBlockFrame::GetNearestAncestorBlock(nsIFrame* aCandidate)
|
||||||
@ -7285,7 +7285,7 @@ nsBlockFrame::GetNearestAncestorBlock(nsIFrame* aCandidate)
|
|||||||
nsBlockFrame* block = nullptr;
|
nsBlockFrame* block = nullptr;
|
||||||
while(aCandidate) {
|
while(aCandidate) {
|
||||||
block = nsLayoutUtils::GetAsBlock(aCandidate);
|
block = nsLayoutUtils::GetAsBlock(aCandidate);
|
||||||
if (block) {
|
if (block) {
|
||||||
// yay, candidate is a block!
|
// yay, candidate is a block!
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
|
@ -628,7 +628,7 @@ protected:
|
|||||||
static void DoRemoveOutOfFlowFrame(nsIFrame* aFrame);
|
static void DoRemoveOutOfFlowFrame(nsIFrame* aFrame);
|
||||||
|
|
||||||
/** set up the conditions necessary for an resize reflow
|
/** set up the conditions necessary for an resize reflow
|
||||||
* the primary task is to mark the minimumly sufficient lines dirty.
|
* the primary task is to mark the minimumly sufficient lines dirty.
|
||||||
*/
|
*/
|
||||||
void PrepareResizeReflow(BlockReflowInput& aState);
|
void PrepareResizeReflow(BlockReflowInput& aState);
|
||||||
|
|
||||||
@ -641,7 +641,7 @@ protected:
|
|||||||
//----------------------------------------
|
//----------------------------------------
|
||||||
// Methods for line reflow
|
// Methods for line reflow
|
||||||
/**
|
/**
|
||||||
* Reflow a line.
|
* Reflow a line.
|
||||||
* @param aState the current reflow state
|
* @param aState the current reflow state
|
||||||
* @param aLine the line to reflow. can contain a single block frame
|
* @param aLine the line to reflow. can contain a single block frame
|
||||||
* or contain 1 or more inline frames.
|
* or contain 1 or more inline frames.
|
||||||
|
Loading…
Reference in New Issue
Block a user