diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-07-20 11:06:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 11:06:08 +0200 |
| commit | edc1da82d86d3c86512f42403c84ee68a4f682a3 (patch) | |
| tree | 8a3afcc91a120e0c93d79075759dcf228b1f1f92 /layout/generic/nsFrame.cpp | |
| parent | 1475cd93165891136da67490312c164d0bb180cd (diff) | |
| parent | 1b153b3f2a70b65fffe6e5a70616681b7aa3ecb6 (diff) | |
| download | UXP-edc1da82d86d3c86512f42403c84ee68a4f682a3.tar UXP-edc1da82d86d3c86512f42403c84ee68a4f682a3.tar.gz UXP-edc1da82d86d3c86512f42403c84ee68a4f682a3.tar.lz UXP-edc1da82d86d3c86512f42403c84ee68a4f682a3.tar.xz UXP-edc1da82d86d3c86512f42403c84ee68a4f682a3.zip | |
Merge pull request #650 from janekptacijarabaci/css_layout_flex-grid_1
Align Css layout flex grid with latest spec
Diffstat (limited to 'layout/generic/nsFrame.cpp')
| -rw-r--r-- | layout/generic/nsFrame.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 418fa16b7..fa5b24d40 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -10289,8 +10289,8 @@ DR_init_constraints_cookie::~DR_init_constraints_cookie() DR_init_offsets_cookie::DR_init_offsets_cookie( nsIFrame* aFrame, - SizeComputationInput* aState, - const LogicalSize& aPercentBasis, + SizeComputationInput* aState, + nscoord aPercentBasis, const nsMargin* aMargin, const nsMargin* aPadding) : mFrame(aFrame) @@ -11243,7 +11243,7 @@ ReflowInput::DisplayInitConstraintsExit(nsIFrame* aFrame, /* static */ void* SizeComputationInput::DisplayInitOffsetsEnter(nsIFrame* aFrame, SizeComputationInput* aState, - const LogicalSize& aPercentBasis, + nscoord aPercentBasis, const nsMargin* aBorder, const nsMargin* aPadding) { @@ -11258,12 +11258,10 @@ SizeComputationInput::DisplayInitOffsetsEnter(nsIFrame* aFrame, if (treeNode && treeNode->mDisplay) { DR_state->DisplayFrameTypeInfo(aFrame, treeNode->mIndent); - char horizPctBasisStr[16]; - char vertPctBasisStr[16]; + char pctBasisStr[16]; WritingMode wm = aState->GetWritingMode(); - DR_state->PrettyUC(aPercentBasis.ISize(wm), horizPctBasisStr, 16); - DR_state->PrettyUC(aPercentBasis.BSize(wm), vertPctBasisStr, 16); - printf("InitOffsets pct_basis=%s,%s", horizPctBasisStr, vertPctBasisStr); + DR_state->PrettyUC(aPercentBasis, pctBasisStr, 16); + printf("InitOffsets pct_basis=%s", pctBasisStr); DR_state->PrintMargin("b", aBorder); DR_state->PrintMargin("p", aPadding); |