Commit 0ddbd1d7 authored by Ting-Yu Lin's avatar Ting-Yu Lin
Browse files

Bug 1543267 Part 2 - Make 'space-between' fallback to 'flex-start' for... 

Bug 1543267 Part 2 - Make 'space-between' fallback to 'flex-start' for flexbox's abspos children. r=dholbert

Per Alignment spec [1], the default fallback alignment for 'space-between' is
'flex-start'.

[1] https://drafts.csswg.org/css-align/#valdef-align-content-space-between

Differential Revision: https://phabricator.services.mozilla.com/D134544
parent 2d47a613

layout/generic/nsFlexContainerFrame.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ static mozilla::StyleAlignFlags SimplifyAlignOrJustifyContentForOneItem( 
  // space-{between,around,evenly} (since those values only make sense with

  // multiple alignment subjects), and otherwise just use the specified value:

  if (specified == StyleAlignFlags::SPACE_BETWEEN) {

    return StyleAlignFlags::START;

    return StyleAlignFlags::FLEX_START;

  }

  if (specified == StyleAlignFlags::SPACE_AROUND ||

      specified == StyleAlignFlags::SPACE_EVENLY) {

testing/web-platform/meta/css/css-flexbox/abspos/position-absolute-001.html.ini

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
[position-absolute-001.html]

  [.flexbox 24]

    expected: FAIL



  [.flexbox 29]

    expected: FAIL



  [.flexbox 34]

    expected: FAIL



  [.flexbox 39]

    expected: FAIL



  [.flexbox 64]

    expected: FAIL



  [.flexbox 69]

    expected: FAIL



  [.flexbox 74]

    expected: FAIL



  [.flexbox 79]

    expected: FAIL



  [.flexbox 104]

    expected: FAIL



  [.flexbox 109]

    expected: FAIL



  [.flexbox 114]

    expected: FAIL



  [.flexbox 119]

    expected: FAIL

testing/web-platform/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-002.html

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
    <div class="container" style="align-content: last baseline"><div data-offset-x="2" data-offset-y="5"></div></div>

    <br>

    <!-- <content-distribution> -->

    <div class="container" style="align-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-between"><div data-offset-x="2" data-offset-y="5"></div></div>

    <div class="container" style="align-content: space-around"><div data-offset-x="2" data-offset-y="3"></div></div>

    <div class="container" style="align-content: space-evenly"><div data-offset-x="2" data-offset-y="3"></div></div>

    <div class="container" style="align-content: stretch"><div data-offset-x="2" data-offset-y="3"></div></div>
@@ -87,7 +87,7 @@ 
    <div class="container" style="align-content: last baseline"><div data-offset-x="2" data-offset-y="-3"></div></div>

    <br>

    <!-- <content-distribution> -->

    <div class="container" style="align-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-between"><div data-offset-x="2" data-offset-y="-3"></div></div>

    <div class="container" style="align-content: space-around"><div data-offset-x="2" data-offset-y="-1"></div></div>

    <div class="container" style="align-content: space-evenly"><div data-offset-x="2" data-offset-y="-1"></div></div>

    <div class="container" style="align-content: stretch"><div data-offset-x="2" data-offset-y="-1"></div></div>

testing/web-platform/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-004.html

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
    <div class="container" style="align-content: last baseline"><div data-offset-x="10" data-offset-y="5"></div></div>

    <br>

    <!-- <content-distribution> -->

    <div class="container" style="align-content: space-between"><div data-offset-x="10" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-between"><div data-offset-x="10" data-offset-y="5"></div></div>

    <div class="container" style="align-content: space-around"><div data-offset-x="10" data-offset-y="3"></div></div>

    <div class="container" style="align-content: space-evenly"><div data-offset-x="10" data-offset-y="3"></div></div>

    <div class="container" style="align-content: stretch"><div data-offset-x="10" data-offset-y="3"></div></div>
@@ -87,7 +87,7 @@ 
    <div class="container" style="align-content: last baseline"><div data-offset-x="-2" data-offset-y="-3"></div></div>

    <br>

    <!-- <content-distribution> -->

    <div class="container" style="align-content: space-between"><div data-offset-x="-2" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-between"><div data-offset-x="-2" data-offset-y="-3"></div></div>

    <div class="container" style="align-content: space-around"><div data-offset-x="-2" data-offset-y="-1"></div></div>

    <div class="container" style="align-content: space-evenly"><div data-offset-x="-2" data-offset-y="-1"></div></div>

    <div class="container" style="align-content: stretch"><div data-offset-x="-2" data-offset-y="-1"></div></div>

testing/web-platform/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-006.html

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
    <div class="container" style="align-content: last baseline"><div data-offset-x="10" data-offset-y="1"></div></div>

    <br>

    <!-- <content-distribution> -->

    <div class="container" style="align-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-between"><div data-offset-x="10" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-around"><div data-offset-x="6" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-evenly"><div data-offset-x="6" data-offset-y="1"></div></div>

    <div class="container" style="align-content: stretch"><div data-offset-x="6" data-offset-y="1"></div></div>
@@ -87,7 +87,7 @@ 
    <div class="container" style="align-content: last baseline"><div data-offset-x="-2" data-offset-y="1"></div></div>

    <br>

    <!-- <content-distribution> -->

    <div class="container" style="align-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-between"><div data-offset-x="-2" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-around"><div data-offset-x="0" data-offset-y="1"></div></div>

    <div class="container" style="align-content: space-evenly"><div data-offset-x="0" data-offset-y="1"></div></div>

    <div class="container" style="align-content: stretch"><div data-offset-x="0" data-offset-y="1"></div></div>