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

Bug 775624 Part 5 - Remove NS_FRAME_IS_COMPLETE. r=dholbert

Browse Source 
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_IS_COMPLETE\(([a-zA-Z0-9.*]*)\)" "\1.IsComplete()"

MozReview-Commit-ID: GOd4y2N6dcz
This commit is contained in:
Ting-Yu Lin
2017-02-11 22:45:07 +08:00
parent cd7928dc29
commit 8d6d261f9f
24 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsRubyBaseContainerFrame.cpp
View File

@@ -405,9 +405,9 @@ nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
// If there exists any span, the columns must either be completely
// reflowed, or be not reflowed at all.
MOZ_ASSERT(NS_INLINE_IS_BREAK_BEFORE(aStatus) ||
NS_FRAME_IS_COMPLETE(aStatus) || !hasSpan);
aStatus.IsComplete() || !hasSpan);
if (!NS_INLINE_IS_BREAK_BEFORE(aStatus) &&
NS_FRAME_IS_COMPLETE(aStatus) && hasSpan) {
aStatus.IsComplete() && hasSpan) {
// Reflow spans
RubyReflowInput reflowInput = {
false, false, textContainers, aReflowInput, reflowInputs
@@ -528,7 +528,7 @@ nsRubyBaseContainerFrame::ReflowColumns(const RubyReflowInput& aReflowInput,
return 0;
}
aStatus = NS_INLINE_LINE_BREAK_AFTER(aStatus);
MOZ_ASSERT(NS_FRAME_IS_COMPLETE(aStatus) || aReflowInput.mAllowLineBreak);
MOZ_ASSERT(aStatus.IsComplete() || aReflowInput.mAllowLineBreak);
// If we are on an intra-level whitespace column, null values in
// column.mBaseFrame and column.mTextFrames don't represent the