1277129 - rename nsHTMLReflowState and nsHTMLReflowMetrics to ReflowInput and ReflowOutput

Status: RESOLVED FIXED

Description

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

We should rename nsHTMLReflowState and nsHTMLReflowMetrics to ReflowInput and ReflowOutput (or maybe ReflowResult?) so people know what they are.

Comment 1

[Ting-Yu Lin [:TYLin] (UTC-7)]

The name confuses me, too.  I would like to help on this.

Comment 2

[Ting-Yu Lin [:TYLin] (UTC-7)]

How about the new name of nsCSSOffsetState which nsHTMLReflowState is inherited from? Do we want to call it CSSReflowInput or something like that?

Do we want to rename nsBlockReflowState to something else as well?

Comment 3

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Perhaps something like:
  nsCSSOffsetState -> SizeCalculationInput or CSSOffsetInput ??
  nsBlockReflowState -> BlockReflowInput
(I think there's also nsTableReflowState.)

I'm not sure about the nsCSSOffsetState renaming, though.

Comment 4

[Ting-Yu Lin [:TYLin] (UTC-7)]

I'm think about renaming nsCSSOffsetState to CSSBoxComputationHelper because it has methods like |ComputedPhysicalMargin|, |ComputeMargin|, etc, and people often use it as a helper struct to get  properties for box model like [1].  I hope CSSBoxComputationHelper is not too mouthful (or just BoxComputationHelper for short).  Bikeshedding welcome!

[1] https://dxr.mozilla.org/mozilla-central/rev/51377a64158941f89ed73f388ae437cfa494c030/layout/generic/nsBlockReflowState.cpp#184,187

Comment 5

[Ting-Yu Lin [:TYLin] (UTC-7)]

I'm working on this bug. We need to rename ScrollReflowState, nsTableCellReflowState, nsRowGroupReflowState, etc, as well.

Comment 6

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

For nsCSSOffsetState (which we just discussed in person), I think we agreed on SizeComputationInput.  (Computation is better than Calculation because it matches the methods.)

Comment 7

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773152 [details]
Bug 1277129 Part 1a - Move nsHTMLReflowState and nsCSSOffsetState into mozilla namespace.

Review commit: https://reviewboard.mozilla.org/r/65870/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65870/

Comment 8

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773153 [details]
Bug 1277129 Part 1b - Rename nsHTMLReflowState.h/cpp to ReflowInput.h/cpp and fix #includes.

The #includes are fixed by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsHTMLReflowState\.h" "mozilla\/ReflowInput\.h"

Review commit: https://reviewboard.mozilla.org/r/65872/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65872/

Comment 9

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773154 [details]
Bug 1277129 Part 1c - Rename nsHTMLReflowState to ReflowInput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename nsHTMLReflowState ReflowInput

Review commit: https://reviewboard.mozilla.org/r/65874/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65874/

Comment 10

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773155 [details]
Bug 1277129 Part 1d - Rename nsCSSOffsetState to SizeComputationInput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename nsCSSOffsetState SizeComputationInput

Review commit: https://reviewboard.mozilla.org/r/65876/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65876/

Comment 11

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773156 [details]
Bug 1277129 Part 2a - Move nsBlockReflowState into mozilla namespace.

Review commit: https://reviewboard.mozilla.org/r/65878/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65878/

Comment 12

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773157 [details]
Bug 1277129 Part 2b - Rename nsBlockReflowState.h/cpp to BlockReflowInput.h/cpp and fix #includes.

The #includes are fixed by the following script:
function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsBlockReflowState\.h" "mozilla\/BlockReflowInput\.h"

Review commit: https://reviewboard.mozilla.org/r/65880/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65880/

Comment 13

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773158 [details]
Bug 1277129 Part 2c - Rename nsBlockReflowState to BlockReflowInput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsBlockReflowState" "BlockReflowInput"

Review commit: https://reviewboard.mozilla.org/r/65882/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65882/

Comment 14

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773159 [details]
Bug 1277129 Part 3a - Move nsTableReflowState, nsRowGroupReflowState, and nsTableCellReflowState into mozilla namespace.

Also move the definition of nsRowGroupReflowState from .h into .cpp as
other two classes did since forward declaration in header is enough.

Review commit: https://reviewboard.mozilla.org/r/65884/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65884/

Comment 15

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773160 [details]
Bug 1277129 Part 3b - Rename nsTableReflowState, nsRowGroupReflowState, and nsTableCellReflowState.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename nsTableReflowState TableReflowInput
rename nsRowGroupReflowState TableRowGroupReflowInput
rename nsTableCellReflowState TableCellReflowInput

Review commit: https://reviewboard.mozilla.org/r/65886/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65886/

Comment 16

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773161 [details]
Bug 1277129 Part 4a - Move ScrollReflowState into mozilla namespace.

Review commit: https://reviewboard.mozilla.org/r/65888/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65888/

Comment 17

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773162 [details]
Bug 1277129 Part 4b - Rename ScrollReflowState to ScrollReflowInput.

Review commit: https://reviewboard.mozilla.org/r/65890/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65890/

Comment 18

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773163 [details]
Bug 1277129 Part 5a - Move nsHTMLReflowMetrics into mozilla namespace.

Review commit: https://reviewboard.mozilla.org/r/65892/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65892/

Comment 19

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773164 [details]
Bug 1277129 Part 5b - Rename nsHTMLReflowMetrics.h/cpp to ReflowOutput.h/cpp and fix #includes.

The modification to nsAbsoluteContainingBlock.h and nsBlockFrame.cpp are
needed to fix the build error due to the file order changed in the unified
build.

The #includes are fixed by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsHTMLReflowMetrics\.h" "mozilla\/ReflowOutput\.h"

Review commit: https://reviewboard.mozilla.org/r/65894/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65894/

Comment 20

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773165 [details]
Bug 1277129 Part 5c - Rename nsHTMLReflowMetrics to ReflowOutput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsHTMLReflowMetrics" "ReflowOutput"

Review commit: https://reviewboard.mozilla.org/r/65896/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65896/

Comment 21

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773166 [details]
Bug 1277129 Part 6a - Rename frame to mFrame in SizeComputationInput.

Review commit: https://reviewboard.mozilla.org/r/65898/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65898/

Comment 22

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773167 [details]
Bug 1277129 Part 6b - Rename rendContext to mRenderingContext in SizeComputationInput.

Review commit: https://reviewboard.mozilla.org/r/65900/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65900/

Comment 23

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773168 [details]
Bug 1277129 Part 7a - Rename ReflowState to RubyReflowInput in nsRubyBaseContainerFrame.

This is a prerequisite for the mass rename variables whose name
containing ReflowState in the next patch. Otherwise
nsRubyBaseContainerFrame::ReflowInput will conflict with
mozilla::ReflowInput.

Review commit: https://reviewboard.mozilla.org/r/65902/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65902/

Comment 24

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773169 [details]
Bug 1277129 Part 7b - Rename various ReflowState variables to ReflowInput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -r "s/$1/$2/g" "{}" \;
}

rename "([[:alpha:]]*)([rR])eflowState(s?)" "\1\2eflowInput\3"

Review commit: https://reviewboard.mozilla.org/r/65904/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65904/

Comment 25

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773170 [details]
Bug 1277129 Part 7c - Rename various RS variables to RI.

This patch is generated by the following script:

function rename() {
find layout\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -r "s/$1/$2/g" "{}" \;
}

rename aChildRS aChildRI
rename aContainingBlockRS aContainingBlockRI
rename aFrameRS aFrameRI
rename aLastRS aLastRI
rename aOuterRS aOuterRI
rename aRS aRI
rename blockHtmlRS blockHtmlRI
rename captionRS captionRI
rename cellRS cellRI
rename childRS childRI
rename firstAncestorRS firstAncestorRI
rename flexContainerRS flexContainerRI
rename gridRS gridRI
rename innerRS innerRI
rename lastButOneRS lastButOneRI
rename LineContainerRS LineContainerRI
rename mBlockRS mBlockRI
rename parentRS parentRI
rename secondAncestorRS secondAncestorRI

Review commit: https://reviewboard.mozilla.org/r/65906/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65906/

Comment 26

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773152 [details]
Bug 1277129 Part 1a - Move nsHTMLReflowState and nsCSSOffsetState into mozilla namespace.

https://reviewboard.mozilla.org/r/65870/#review62788

Comment 27

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773153 [details]
Bug 1277129 Part 1b - Rename nsHTMLReflowState.h/cpp to ReflowInput.h/cpp and fix #includes.

https://reviewboard.mozilla.org/r/65872/#review62790

::: layout/generic/nsBlockReflowContext.h:23
(Diff revision 1)
> +  using nsHTMLReflowState = mozilla::nsHTMLReflowState;
> +

This belongs in the previous patch, I think.

Comment 28

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773154 [details]
Bug 1277129 Part 1c - Rename nsHTMLReflowState to ReflowInput.

https://reviewboard.mozilla.org/r/65874/#review62792

Comment 29

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773155 [details]
Bug 1277129 Part 1d - Rename nsCSSOffsetState to SizeComputationInput.

https://reviewboard.mozilla.org/r/65876/#review62794

Comment 30

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773156 [details]
Bug 1277129 Part 2a - Move nsBlockReflowState into mozilla namespace.

https://reviewboard.mozilla.org/r/65878/#review62798

Comment 31

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773157 [details]
Bug 1277129 Part 2b - Rename nsBlockReflowState.h/cpp to BlockReflowInput.h/cpp and fix #includes.

https://reviewboard.mozilla.org/r/65880/#review62800

::: layout/generic/moz.build:103
(Diff revision 1)
>  EXPORTS.mozilla += [
> +    'BlockReflowInput.h',
>      'ReflowInput.h',
>      'WritingModes.h',
>  ]

I think I'd prefer not to export this publicly.  That means dropping this change, and switching the #includes back to not use "mozilla/".

Comment 32

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773158 [details]
Bug 1277129 Part 2c - Rename nsBlockReflowState to BlockReflowInput.

https://reviewboard.mozilla.org/r/65882/#review62802

Comment 33

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773159 [details]
Bug 1277129 Part 3a - Move nsTableReflowState, nsRowGroupReflowState, and nsTableCellReflowState into mozilla namespace.

https://reviewboard.mozilla.org/r/65884/#review62804

::: layout/tables/nsTableRowGroupFrame.h
(Diff revision 1)
> -struct nsRowGroupReflowState {
> -  using ReflowInput = mozilla::ReflowInput;

I'd slightly prefer to keep this where it was in the .h file rather than moving it to the .cpp file.  (At a minimum, it breaks blame less.)

Was there a reason for moving it?

Comment 34

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773160 [details]
Bug 1277129 Part 3b - Rename nsTableReflowState, nsRowGroupReflowState, and nsTableCellReflowState.

https://reviewboard.mozilla.org/r/65886/#review62806

Comment 35

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773161 [details]
Bug 1277129 Part 4a - Move ScrollReflowState into mozilla namespace.

https://reviewboard.mozilla.org/r/65888/#review62808

Comment 36

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773162 [details]
Bug 1277129 Part 4b - Rename ScrollReflowState to ScrollReflowInput.

https://reviewboard.mozilla.org/r/65890/#review62810

Comment 37

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773163 [details]
Bug 1277129 Part 5a - Move nsHTMLReflowMetrics into mozilla namespace.

https://reviewboard.mozilla.org/r/65892/#review62812

Comment 38

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773164 [details]
Bug 1277129 Part 5b - Rename nsHTMLReflowMetrics.h/cpp to ReflowOutput.h/cpp and fix #includes.

https://reviewboard.mozilla.org/r/65894/#review62816

Comment 39

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773165 [details]
Bug 1277129 Part 5c - Rename nsHTMLReflowMetrics to ReflowOutput.

https://reviewboard.mozilla.org/r/65896/#review62826

Comment 40

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773166 [details]
Bug 1277129 Part 6a - Rename frame to mFrame in SizeComputationInput.

https://reviewboard.mozilla.org/r/65898/#review62828

Comment 41

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773167 [details]
Bug 1277129 Part 6b - Rename rendContext to mRenderingContext in SizeComputationInput.

https://reviewboard.mozilla.org/r/65900/#review62830

Comment 42

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773168 [details]
Bug 1277129 Part 7a - Rename ReflowState to RubyReflowInput in nsRubyBaseContainerFrame.

https://reviewboard.mozilla.org/r/65902/#review62832

Comment 43

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773169 [details]
Bug 1277129 Part 7b - Rename various ReflowState variables to ReflowInput.

https://reviewboard.mozilla.org/r/65904/#review62834

Comment 44

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

Comment on attachment 8773170 [details]
Bug 1277129 Part 7c - Rename various RS variables to RI.

https://reviewboard.mozilla.org/r/65906/#review62836

Could you also fix the local variables lastRSSize and lastRSPadding in nsBlockFrame.cpp?

r=dbaron with that

Comment 45

[Ting-Yu Lin [:TYLin] (UTC-7)]

https://reviewboard.mozilla.org/r/65872/#review62790

> This belongs in the previous patch, I think.

Nice catch! Will fix.

Comment 46

[Ting-Yu Lin [:TYLin] (UTC-7)]

https://reviewboard.mozilla.org/r/65880/#review62800

> I think I'd prefer not to export this publicly.  That means dropping this change, and switching the #includes back to not use "mozilla/".

Oh yes. nsBlockReflowState is not being exported publicly. We'd better keep it that way.

Comment 47

[Ting-Yu Lin [:TYLin] (UTC-7)]

https://reviewboard.mozilla.org/r/65884/#review62804

> I'd slightly prefer to keep this where it was in the .h file rather than moving it to the .cpp file.  (At a minimum, it breaks blame less.)
> 
> Was there a reason for moving it?

Yes. Other structs like nsTableReflowState and nsTableCellReflowState live in .cpp file since they won't be used by other .cpp file. So does the nsRowGroupReflowState.

Comment 48

[Ting-Yu Lin [:TYLin] (UTC-7)]

https://reviewboard.mozilla.org/r/65906/#review62836

Sure. Will fix lastRSSize and lastRSPadding in nsBlockFrame.cpp.

Comment 49

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773216 [details]
Bug 1277129 Part 1b - Rename nsHTMLReflowState.h/cpp to ReflowInput.h/cpp and fix #includes.

The #includes are fixed by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsHTMLReflowState\.h" "mozilla\/ReflowInput\.h"

Review commit: https://reviewboard.mozilla.org/r/65970/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65970/

Comment 50

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773217 [details]
Bug 1277129 Part 1c - Rename nsHTMLReflowState to ReflowInput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename nsHTMLReflowState ReflowInput

Review commit: https://reviewboard.mozilla.org/r/65972/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65972/

Comment 51

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773218 [details]
Bug 1277129 Part 1d - Rename nsCSSOffsetState to SizeComputationInput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename nsCSSOffsetState SizeComputationInput

Review commit: https://reviewboard.mozilla.org/r/65974/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65974/

Comment 52

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773219 [details]
Bug 1277129 Part 2a - Move nsBlockReflowState into mozilla namespace.

Review commit: https://reviewboard.mozilla.org/r/65976/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65976/

Comment 53

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773220 [details]
Bug 1277129 Part 2b - Rename nsBlockReflowState.h/cpp to BlockReflowInput.h/cpp and fix #includes.

The #includes are fixed by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsBlockReflowState\.h" "BlockReflowInput\.h"

Review commit: https://reviewboard.mozilla.org/r/65978/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65978/

Comment 54

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773221 [details]
Bug 1277129 Part 2c - Rename nsBlockReflowState to BlockReflowInput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsBlockReflowState" "BlockReflowInput"

Review commit: https://reviewboard.mozilla.org/r/65980/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65980/

Comment 55

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773222 [details]
Bug 1277129 Part 3a - Move nsTableReflowState, nsRowGroupReflowState, and nsTableCellReflowState into mozilla namespace.

Also move the definition of nsRowGroupReflowState from .h into .cpp as
other two classes did since forward declaration in header is enough.

Review commit: https://reviewboard.mozilla.org/r/65982/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65982/

Comment 56

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773223 [details]
Bug 1277129 Part 3b - Rename nsTableReflowState, nsRowGroupReflowState, and nsTableCellReflowState.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename nsTableReflowState TableReflowInput
rename nsRowGroupReflowState TableRowGroupReflowInput
rename nsTableCellReflowState TableCellReflowInput

Review commit: https://reviewboard.mozilla.org/r/65984/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65984/

Comment 57

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773224 [details]
Bug 1277129 Part 4a - Move ScrollReflowState into mozilla namespace.

Review commit: https://reviewboard.mozilla.org/r/65986/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65986/

Comment 58

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773225 [details]
Bug 1277129 Part 4b - Rename ScrollReflowState to ScrollReflowInput.

Review commit: https://reviewboard.mozilla.org/r/65988/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65988/

Comment 59

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773226 [details]
Bug 1277129 Part 5a - Move nsHTMLReflowMetrics into mozilla namespace.

Review commit: https://reviewboard.mozilla.org/r/65990/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65990/

Comment 60

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773227 [details]
Bug 1277129 Part 5b - Rename nsHTMLReflowMetrics.h/cpp to ReflowOutput.h/cpp and fix #includes.

The modification to nsAbsoluteContainingBlock.h and nsBlockFrame.cpp are
needed to fix the build error due to the file order changed in the unified
build.

The #includes are fixed by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsHTMLReflowMetrics\.h" "mozilla\/ReflowOutput\.h"

Review commit: https://reviewboard.mozilla.org/r/65992/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65992/

Comment 61

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773228 [details]
Bug 1277129 Part 5c - Rename nsHTMLReflowMetrics to ReflowOutput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -e "s/$1/$2/g" "{}" \;
}

rename "nsHTMLReflowMetrics" "ReflowOutput"

Review commit: https://reviewboard.mozilla.org/r/65994/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65994/

Comment 62

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773229 [details]
Bug 1277129 Part 6a - Rename frame to mFrame in SizeComputationInput.

Review commit: https://reviewboard.mozilla.org/r/65996/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65996/

Comment 63

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773230 [details]
Bug 1277129 Part 6b - Rename rendContext to mRenderingContext in SizeComputationInput.

Review commit: https://reviewboard.mozilla.org/r/65998/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/65998/

Comment 64

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773231 [details]
Bug 1277129 Part 7a - Rename ReflowState to RubyReflowInput in nsRubyBaseContainerFrame.

This is a prerequisite for the mass rename variables whose name
containing ReflowState in the next patch. Otherwise
nsRubyBaseContainerFrame::ReflowInput will conflict with
mozilla::ReflowInput.

Review commit: https://reviewboard.mozilla.org/r/66000/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/66000/

Comment 65

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773232 [details]
Bug 1277129 Part 7b - Rename various ReflowState variables to ReflowInput.

This patch is generated by the following script:

function rename() {
find .\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -r "s/$1/$2/g" "{}" \;
}

rename "([[:alpha:]]*)([rR])eflowState(s?)" "\1\2eflowInput\3"

Review commit: https://reviewboard.mozilla.org/r/66002/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/66002/

Comment 66

[Ting-Yu Lin [:TYLin] (UTC-7)]

Created attachment 8773233 [details]
Bug 1277129 Part 7c - Rename various RS variables to RI.

This patch is generated by the following script:

function rename() {
find layout\
     -type f\
     ! -path "./obj*"\
     ! -path "./.git"\
     ! -path "./.hg"\
     \( -name "*.cpp" -or\
        -name "*.h" \)\
        -exec sed -i -r "s/$1/$2/g" "{}" \;
}

rename aChildRS aChildRI
rename aContainingBlockRS aContainingBlockRI
rename aFrameRS aFrameRI
rename aLastRS aLastRI
rename aOuterRS aOuterRI
rename aRS aRI
rename blockHtmlRS blockHtmlRI
rename captionRS captionRI
rename cellRS cellRI
rename childRS childRI
rename firstAncestorRS firstAncestorRI
rename flexContainerRS flexContainerRI
rename gridRS gridRI
rename innerRS innerRI
rename lastButOneRS lastButOneRI
rename LineContainerRS LineContainerRI
rename mBlockRS mBlockRI
rename parentRS parentRI
rename secondAncestorRS secondAncestorRI
rename lastRSSize lastRISize
rename lastRSPadding lastRIPadding

Review commit: https://reviewboard.mozilla.org/r/66004/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/66004/

Comment 67

[Ting-Yu Lin [:TYLin] (UTC-7)]

Comment on attachment 8773152 [details]
Bug 1277129 Part 1a - Move nsHTMLReflowState and nsCSSOffsetState into mozilla namespace.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/65870/diff/1-2/

Comment 68

[Ting-Yu Lin [:TYLin] (UTC-7)]

I have no idea why those R+ are gone except the first patch. Perhaps I mess up with the MozReview-Commit-ID thing. Anyway I'll land patches manually to inbound.

Comment 69

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/b13f7e9f8107
Part 1a - Move nsHTMLReflowState and nsCSSOffsetState into mozilla namespace. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/999402eb1b15
Part 1b - Rename nsHTMLReflowState.h/cpp to ReflowInput.h/cpp and fix #includes. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/36e0aef210e2
Part 1c - Rename nsHTMLReflowState to ReflowInput. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/7fa3859b444c
Part 1d - Rename nsCSSOffsetState to SizeComputationInput. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/f70b71911f7f
Part 2a - Move nsBlockReflowState into mozilla namespace. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/3ae833bfcad4
Part 2b - Rename nsBlockReflowState.h/cpp to BlockReflowInput.h/cpp and fix #includes. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/d8ef49c1d01e
Part 2c - Rename nsBlockReflowState to BlockReflowInput. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/64eb9c0b65c7
Part 3a - Move nsTableReflowState, nsRowGroupReflowState, and nsTableCellReflowState into mozilla namespace. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/63e083e58002
Part 3b - Rename nsTableReflowState, nsRowGroupReflowState, and nsTableCellReflowState. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/5264e630fc3f
Part 4a - Move ScrollReflowState into mozilla namespace. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/14c11d5cdfcf
Part 4b - Rename ScrollReflowState to ScrollReflowInput. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/8c97676c3648
Part 5a - Move nsHTMLReflowMetrics into mozilla namespace. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/1e22c6ef454e
Part 5b - Rename nsHTMLReflowMetrics.h/cpp to ReflowOutput.h/cpp and fix #includes. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/b2db47ba3268
Part 5c - Rename nsHTMLReflowMetrics to ReflowOutput. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/a70b04f074fc
Part 6a - Rename frame to mFrame in SizeComputationInput. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/5a110f2dcab4
Part 6b - Rename rendContext to mRenderingContext in SizeComputationInput. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/60b14e06c561
Part 7a - Rename ReflowState to RubyReflowInput in nsRubyBaseContainerFrame. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/d1a449efbe44
Part 7b - Rename various ReflowState variables to ReflowInput. r=dbaron
https://hg.mozilla.org/integration/mozilla-inbound/rev/ec9c3a2f2c09
Part 7c - Rename various RS variables to RI. r=dbaron

Comment 70

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/b13f7e9f8107
https://hg.mozilla.org/mozilla-central/rev/999402eb1b15
https://hg.mozilla.org/mozilla-central/rev/36e0aef210e2
https://hg.mozilla.org/mozilla-central/rev/7fa3859b444c
https://hg.mozilla.org/mozilla-central/rev/f70b71911f7f
https://hg.mozilla.org/mozilla-central/rev/3ae833bfcad4
https://hg.mozilla.org/mozilla-central/rev/d8ef49c1d01e
https://hg.mozilla.org/mozilla-central/rev/64eb9c0b65c7
https://hg.mozilla.org/mozilla-central/rev/63e083e58002
https://hg.mozilla.org/mozilla-central/rev/5264e630fc3f
https://hg.mozilla.org/mozilla-central/rev/14c11d5cdfcf
https://hg.mozilla.org/mozilla-central/rev/8c97676c3648
https://hg.mozilla.org/mozilla-central/rev/1e22c6ef454e
https://hg.mozilla.org/mozilla-central/rev/b2db47ba3268
https://hg.mozilla.org/mozilla-central/rev/a70b04f074fc
https://hg.mozilla.org/mozilla-central/rev/5a110f2dcab4
https://hg.mozilla.org/mozilla-central/rev/60b14e06c561
https://hg.mozilla.org/mozilla-central/rev/d1a449efbe44
https://hg.mozilla.org/mozilla-central/rev/ec9c3a2f2c09

Comment 71

[David Baron :dbaron: 🏴󠁵󠁳󠁣󠁡󠁿 ⌚UTC-7]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4c3a2d9775068884d9cb15a88d63dba5e3cdbeca
Some updates to the data for './mach file-info bugzilla-component' in layout/generic, partly for bug 1277129.  No review.

Comment 72

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/4c3a2d977506