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

Bug 775624 Part 18 - Convert NS_INLINE_IS_BREAK to a method. r=dholbert

Browse Source 
MozReview-Commit-ID: 7Tw1BUjOYgg
This commit is contained in:
Ting-Yu Lin
2017-02-14 16:33:37 +08:00
parent 899e0f6d07
commit af9153f958
5 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
layout/generic/nsRubyBaseContainerFrame.cpp
View File

@@ -399,7 +399,7 @@ nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
// container could be non-zero because of non-empty ruby annotations.
// XXX When bug 765861 gets fixed, this warning should be upgraded.
NS_WARNING_ASSERTION(
NS_INLINE_IS_BREAK(aStatus) || isize == lineSpanSize || mFrames.IsEmpty(),
aStatus.IsInlineBreak() || isize == lineSpanSize || mFrames.IsEmpty(),
"bad isize");
// If there exists any span, the columns must either be completely
@@ -483,7 +483,7 @@ nsRubyBaseContainerFrame::ReflowColumns(const RubyReflowInput& aReflowInput,
if (!reflowStatus.IsInlineBreakBefore()) {
columnIndex++;
}
if (NS_INLINE_IS_BREAK(reflowStatus)) {
if (reflowStatus.IsInlineBreak()) {
break;
}
// We are not handling overflow here.
@@ -492,7 +492,7 @@ nsRubyBaseContainerFrame::ReflowColumns(const RubyReflowInput& aReflowInput,
bool isComplete = false;
PullFrameState pullFrameState(this, aReflowInput.mTextContainers);
while (!NS_INLINE_IS_BREAK(reflowStatus)) {
while (!reflowStatus.IsInlineBreak()) {
// We are not handling overflow here.
MOZ_ASSERT(reflowStatus == NS_FRAME_COMPLETE);
@@ -640,7 +640,7 @@ nsRubyBaseContainerFrame::ReflowOneColumn(const RubyReflowInput& aReflowInput,
nsLineLayout* lineLayout = textReflowInputs[i]->mLineLayout;
nscoord textIStart = lineLayout->GetCurrentICoord();
lineLayout->ReflowFrame(textFrame, reflowStatus, nullptr, pushedFrame);
if (MOZ_UNLIKELY(NS_INLINE_IS_BREAK(reflowStatus) || pushedFrame)) {
if (MOZ_UNLIKELY(reflowStatus.IsInlineBreak() || pushedFrame)) {
MOZ_ASSERT_UNREACHABLE(
"Any line break inside ruby box should have been suppressed");
// For safety, always drain the overflow list, so that
@@ -662,7 +662,7 @@ nsRubyBaseContainerFrame::ReflowOneColumn(const RubyReflowInput& aReflowInput,
nscoord baseIStart = lineLayout->GetCurrentICoord();
lineLayout->ReflowFrame(aColumn.mBaseFrame, reflowStatus,
nullptr, pushedFrame);
if (MOZ_UNLIKELY(NS_INLINE_IS_BREAK(reflowStatus) || pushedFrame)) {
if (MOZ_UNLIKELY(reflowStatus.IsInlineBreak() || pushedFrame)) {
MOZ_ASSERT_UNREACHABLE(
"Any line break inside ruby box should have been suppressed");
// For safety, always drain the overflow list, so that
@@ -828,7 +828,7 @@ nsRubyBaseContainerFrame::ReflowSpans(const RubyReflowInput& aReflowInput)
MOZ_ASSERT(lineLayout->GetCurrentICoord() == 0,
"border/padding of rtc should have been suppressed");
lineLayout->ReflowFrame(rtFrame, reflowStatus, nullptr, pushedFrame);
MOZ_ASSERT(!NS_INLINE_IS_BREAK(reflowStatus) && !pushedFrame,
MOZ_ASSERT(!reflowStatus.IsInlineBreak() && !pushedFrame,
"Any line break inside ruby box should has been suppressed");
spanISize = std::max(spanISize, lineLayout->GetCurrentICoord());
}