Commit b02c8246 authored by David Shin's avatar David Shin
Browse files

Bug 1815936 - In flexbox baseline calculation, ensure that the offset... 

Bug 1815936 - In flexbox baseline calculation, ensure that the offset originates from border-start. r=dholbert

`GetNaturalBaselineBOffset` returns the offset originating from border-end for
last baselines.

Differential Revision: https://phabricator.services.mozilla.com/D169362
parent 52ce2e3d

layout/generic/nsFlexContainerFrame.cpp

+5 −0
Original line number Diff line number Diff line
@@ -421,6 +421,11 @@ class nsFlexContainerFrame::FlexItem final { 
    auto baselineGroup = aUseFirstBaseline ? BaselineSharingGroup::First

                                           : BaselineSharingGroup::Last;

    if (mFrame->GetNaturalBaselineBOffset(mWM, baselineGroup, &mAscent)) {

      if (baselineGroup == BaselineSharingGroup::Last) {

        // Offset for last baseline from `GetNaturalBaselineBOffset` originates

        // from the frame's block end, so convert it back.

        mAscent = mFrame->BSize(mWM) - mAscent;

      }

      return mAscent;

    }

testing/web-platform/meta/css/css-flexbox/alignment/flex-align-baseline-fieldset-001.html.ini

+0 −8
Original line number Diff line number Diff line 
[flex-align-baseline-fieldset-001.html]

  expected:

    if (os == "android") and fission: [OK, TIMEOUT]

  [.target > * 1]

    expected: FAIL



  [.target > * 2]

    expected: FAIL
 


  [.target > * 3]

    expected: FAIL



  [.target > * 4]

    expected: FAIL

testing/web-platform/meta/css/css-flexbox/alignment/flex-align-baseline-fieldset-002.html.ini

+0 −5
Original line number Diff line number Diff line 
[flex-align-baseline-fieldset-002.html]

  expected:

    if (os == "android") and fission: [OK, TIMEOUT]

  [.target > * 1]

    expected: FAIL
 


  [.target > * 3]

    expected: FAIL

testing/web-platform/meta/css/css-flexbox/alignment/flex-align-baseline-fieldset-003.html.ini

+0 −5
Original line number Diff line number Diff line 
[flex-align-baseline-fieldset-003.html]

  expected:

    if (os == "android") and fission: [OK, TIMEOUT]

  [.target > * 1]

    expected: FAIL



  [.target > * 2]

    expected: FAIL
 


  [.target > * 3]

    expected: FAIL

testing/web-platform/meta/css/css-flexbox/alignment/flex-align-baseline-grid-001.html.ini

+0 −11
Original line number Diff line number Diff line 
[flex-align-baseline-grid-001.html]

  expected:

    if (os == "android") and fission: [OK, TIMEOUT]

  [.target > * 3]

    expected: FAIL



  [.target > * 5]

    expected: FAIL
 


  [.target > * 7]

    expected: FAIL



  [.target > * 8]

    expected: FAIL



  [.target > * 11]

    expected: FAIL