зеркало из https://github.com/mozilla/gecko-dev.git
Bug 775624 Part 6 - Remove NS_FRAME_OVERFLOW_IS_INCOMPLETE. r=dholbert
This patch is written by the help of the following script. function rename() { find layout\ -type f\ \( -name "*.cpp" -or\ -name "*.h" \)\ -exec sed -i -r "s/$1/$2/g" "{}" \; } rename "NS_FRAME_OVERFLOW_IS_INCOMPLETE\(([a-zA-Z0-9.*]*)\)" "\1.IsOverflowIncomplete()" MozReview-Commit-ID: GOd4y2N6dcz --HG-- extra : rebase_source : 2945ff0274d91137249eb2b5a053eeec08864a25
This commit is contained in:
Родитель
f7a393e947
Коммит
ba8d9f3b05
|
@ -4303,14 +4303,14 @@ nsBlockFrame::SplitFloat(BlockReflowInput& aState,
|
||||||
if (oldParent != this) {
|
if (oldParent != this) {
|
||||||
ReparentFrame(nextInFlow, oldParent, this);
|
ReparentFrame(nextInFlow, oldParent, this);
|
||||||
}
|
}
|
||||||
if (!NS_FRAME_OVERFLOW_IS_INCOMPLETE(aFloatStatus)) {
|
if (!aFloatStatus.IsOverflowIncomplete()) {
|
||||||
nextInFlow->RemoveStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
|
nextInFlow->RemoveStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
nextInFlow = aState.mPresContext->PresShell()->FrameConstructor()->
|
nextInFlow = aState.mPresContext->PresShell()->FrameConstructor()->
|
||||||
CreateContinuingFrame(aState.mPresContext, aFloat, this);
|
CreateContinuingFrame(aState.mPresContext, aFloat, this);
|
||||||
}
|
}
|
||||||
if (NS_FRAME_OVERFLOW_IS_INCOMPLETE(aFloatStatus)) {
|
if (aFloatStatus.IsOverflowIncomplete()) {
|
||||||
nextInFlow->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
|
nextInFlow->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -728,7 +728,7 @@ nsCanvasFrame::Reflow(nsPresContext* aPresContext,
|
||||||
// aren't any other frames we need to isolate them from
|
// aren't any other frames we need to isolate them from
|
||||||
// during reflow.
|
// during reflow.
|
||||||
}
|
}
|
||||||
if (NS_FRAME_OVERFLOW_IS_INCOMPLETE(aStatus)) {
|
if (aStatus.IsOverflowIncomplete()) {
|
||||||
nextFrame->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
|
nextFrame->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -703,7 +703,7 @@ nsColumnSetFrame::ReflowChildren(ReflowOutput& aDesiredSize,
|
||||||
|
|
||||||
// Make sure we reflow a next-in-flow when it switches between being
|
// Make sure we reflow a next-in-flow when it switches between being
|
||||||
// normal or overflow container
|
// normal or overflow container
|
||||||
if (NS_FRAME_OVERFLOW_IS_INCOMPLETE(aStatus)) {
|
if (aStatus.IsOverflowIncomplete()) {
|
||||||
if (!(kidNextInFlow->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER)) {
|
if (!(kidNextInFlow->GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER)) {
|
||||||
aStatus |= NS_FRAME_REFLOW_NEXTINFLOW;
|
aStatus |= NS_FRAME_REFLOW_NEXTINFLOW;
|
||||||
reflowNext = true;
|
reflowNext = true;
|
||||||
|
|
|
@ -376,7 +376,7 @@ public:
|
||||||
* them to our overflow container list
|
* them to our overflow container list
|
||||||
* 2. Reflows all our overflow container kids
|
* 2. Reflows all our overflow container kids
|
||||||
* 3. Expands aOverflowRect as necessary to accomodate these children.
|
* 3. Expands aOverflowRect as necessary to accomodate these children.
|
||||||
* 4. Sets aStatus's NS_FRAME_OVERFLOW_IS_INCOMPLETE flag (along with
|
* 4. Sets aStatus's mOverflowIncomplete flag (along with
|
||||||
* NS_FRAME_REFLOW_NEXTINFLOW as necessary) if any overflow children
|
* NS_FRAME_REFLOW_NEXTINFLOW as necessary) if any overflow children
|
||||||
* are incomplete and
|
* are incomplete and
|
||||||
* 5. Prepends a list of their continuations to our excess overflow
|
* 5. Prepends a list of their continuations to our excess overflow
|
||||||
|
|
|
@ -303,9 +303,6 @@ private:
|
||||||
#define NS_FRAME_REFLOW_NEXTINFLOW 0x2
|
#define NS_FRAME_REFLOW_NEXTINFLOW 0x2
|
||||||
#define NS_FRAME_OVERFLOW_INCOMPLETE 0x4
|
#define NS_FRAME_OVERFLOW_INCOMPLETE 0x4
|
||||||
|
|
||||||
#define NS_FRAME_OVERFLOW_IS_INCOMPLETE(status) \
|
|
||||||
(0 != ((status) & NS_FRAME_OVERFLOW_INCOMPLETE))
|
|
||||||
|
|
||||||
// These macros set or switch incomplete statuses without touching the
|
// These macros set or switch incomplete statuses without touching the
|
||||||
// NS_FRAME_REFLOW_NEXTINFLOW bit.
|
// NS_FRAME_REFLOW_NEXTINFLOW bit.
|
||||||
#define NS_FRAME_SET_INCOMPLETE(status) \
|
#define NS_FRAME_SET_INCOMPLETE(status) \
|
||||||
|
|
|
@ -165,7 +165,7 @@ nsRubyFrame::Reflow(nsPresContext* aPresContext,
|
||||||
ReflowSegment(aPresContext, aReflowInput, baseContainer, aStatus);
|
ReflowSegment(aPresContext, aReflowInput, baseContainer, aStatus);
|
||||||
}
|
}
|
||||||
// We never handle overflow in ruby.
|
// We never handle overflow in ruby.
|
||||||
MOZ_ASSERT(!NS_FRAME_OVERFLOW_IS_INCOMPLETE(aStatus));
|
MOZ_ASSERT(!aStatus.IsOverflowIncomplete());
|
||||||
|
|
||||||
aDesiredSize.ISize(lineWM) = aReflowInput.mLineLayout->EndSpan(this);
|
aDesiredSize.ISize(lineWM) = aReflowInput.mLineLayout->EndSpan(this);
|
||||||
if (boxDecorationBreakClone || !GetPrevContinuation()) {
|
if (boxDecorationBreakClone || !GetPrevContinuation()) {
|
||||||
|
|
|
@ -957,7 +957,7 @@ nsTableCellFrame::Reflow(nsPresContext* aPresContext,
|
||||||
|
|
||||||
ReflowChild(firstKid, aPresContext, kidSize, kidReflowInput,
|
ReflowChild(firstKid, aPresContext, kidSize, kidReflowInput,
|
||||||
wm, kidOrigin, containerSize, 0, aStatus);
|
wm, kidOrigin, containerSize, 0, aStatus);
|
||||||
if (NS_FRAME_OVERFLOW_IS_INCOMPLETE(aStatus)) {
|
if (aStatus.IsOverflowIncomplete()) {
|
||||||
// Don't pass OVERFLOW_INCOMPLETE through tables until they can actually handle it
|
// Don't pass OVERFLOW_INCOMPLETE through tables until they can actually handle it
|
||||||
//XXX should paginate overflow as overflow, but not in this patch (bug 379349)
|
//XXX should paginate overflow as overflow, but not in this patch (bug 379349)
|
||||||
NS_FRAME_SET_INCOMPLETE(aStatus);
|
NS_FRAME_SET_INCOMPLETE(aStatus);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче