Bug 1313254 part 2 - [css-align] Change "last-baseline" to "last baseline" in layout/ (scripted change). r=dholbert
authorMats Palmgren <mats@mozilla.com>
Sat, 05 Nov 2016 02:57:07 +0100
changeset 321262 06769bb604a358d6f18e7843cc90123078051edd
parent 321261 28219b1ad2983b16d1dbbab260aae44bb2cdd0c2
child 321263 ded8afadf519a170c83de09ad706a7c2c63c7995
push id30920
push userphilringnalda@gmail.com
push dateSat, 05 Nov 2016 20:41:02 +0000
treeherdermozilla-central@c44c01dfd264 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1313254
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1313254 part 2 - [css-align] Change "last-baseline" to "last baseline" in layout/ (scripted change). r=dholbert
layout/generic/CSSAlignUtils.cpp
layout/generic/crashtests/1278007.html
layout/generic/nsAbsoluteContainingBlock.cpp
layout/generic/nsFlexContainerFrame.cpp
layout/generic/nsGridContainerFrame.cpp
layout/reftests/css-grid/grid-container-baselines-001-ref.html
layout/reftests/css-grid/grid-container-baselines-001.html
layout/reftests/css-grid/grid-container-baselines-002-ref.html
layout/reftests/css-grid/grid-container-baselines-002.html
layout/reftests/css-grid/grid-container-baselines-003-ref.html
layout/reftests/css-grid/grid-container-baselines-003.html
layout/reftests/css-grid/grid-item-content-baseline-001-ref.html
layout/reftests/css-grid/grid-item-content-baseline-001.html
layout/reftests/css-grid/grid-item-content-baseline-002-ref.html
layout/reftests/css-grid/grid-item-content-baseline-002.html
layout/reftests/css-grid/grid-item-mixed-baseline-001-ref.html
layout/reftests/css-grid/grid-item-mixed-baseline-001.html
layout/reftests/css-grid/grid-item-mixed-baseline-002-ref.html
layout/reftests/css-grid/grid-item-mixed-baseline-002.html
layout/reftests/css-grid/grid-item-mixed-baseline-003-ref.html
layout/reftests/css-grid/grid-item-mixed-baseline-003.html
layout/reftests/css-grid/grid-item-mixed-baseline-004-ref.html
layout/reftests/css-grid/grid-item-mixed-baseline-004.html
layout/reftests/css-grid/grid-item-self-baseline-001-ref.html
layout/reftests/css-grid/grid-item-self-baseline-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-self-001.html
--- a/layout/generic/CSSAlignUtils.cpp
+++ b/layout/generic/CSSAlignUtils.cpp
@@ -99,17 +99,17 @@ CSSAlignUtils::AlignJustifySelf(uint8_t 
   // https://drafts.csswg.org/css-align-3/#overflow-values
   // This implements <overflow-position> = 'safe'.
   // And auto-margins: https://drafts.csswg.org/css-grid/#auto-margins
   if ((MOZ_UNLIKELY(isOverflowSafe) && aAlignment != NS_STYLE_ALIGN_START) ||
       hasAutoMarginStart || hasAutoMarginEnd) {
     nscoord space = SpaceToFill(wm, aChildSize, marginStart + marginEnd,
                                 aAxis, aCBSize);
     // XXX we might want to include == 0 here as an optimization -
-    // I need to see what the baseline/last-baseline code looks like first.
+    // I need to see what the baseline/last baseline code looks like first.
     if (space < 0) {
       // "Overflowing elements ignore their auto margins and overflow
       // in the end directions"
       aAlignment = NS_STYLE_ALIGN_START;
     } else if (hasAutoMarginEnd) {
       aAlignment = hasAutoMarginStart ? NS_STYLE_ALIGN_CENTER
                                       : (isSameSide ? NS_STYLE_ALIGN_START
                                                     : NS_STYLE_ALIGN_END);
--- a/layout/generic/crashtests/1278007.html
+++ b/layout/generic/crashtests/1278007.html
@@ -3,17 +3,17 @@
   <meta charset="utf-8">
   <title></title>
   <style type="text/css">
 .grid {
   display: grid;
 }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; }
+.slb { align-self:last baseline; }
 
 .vl { writing-mode: vertical-lr; }
 
 </style>
 </head>
 <body>
 
 <div class="grid"><input class="slb"></div>
--- a/layout/generic/nsAbsoluteContainingBlock.cpp
+++ b/layout/generic/nsAbsoluteContainingBlock.cpp
@@ -437,17 +437,17 @@ OffsetToAlignedStaticPos(const ReflowInp
   // Find out if placeholder-container & the OOF child have the same start-sides
   // in the placeholder-container's pcAxis.
   WritingMode kidWM = aKidReflowInput.GetWritingMode();
   if (pcWM.ParallelAxisStartsOnSameSide(pcAxis, kidWM)) {
     flags |= AlignJustifyFlags::eSameSide;
   }
 
   // (baselineAdjust is unused. CSSAlignmentForAbsPosChild() should've
-  // converted 'baseline'/'last-baseline' enums to their fallback values.)
+  // converted 'baseline'/'last baseline' enums to their fallback values.)
   const nscoord baselineAdjust = nscoord(0);
 
   // AlignJustifySelf operates in the kid's writing mode, so we need to
   // represent the child's size and the desired axis in that writing mode:
   LogicalSize kidSizeInOwnWM = aKidSizeInAbsPosCBWM.ConvertTo(kidWM,
                                                               aAbsPosCBWM);
   LogicalAxis kidAxis = (kidWM.IsOrthogonalTo(aAbsPosCBWM)
                          ? GetOrthogonalAxis(aAbsPosCBAxis)
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -1292,17 +1292,17 @@ nsFlexContainerFrame::CSSAlignmentForAbs
         // absolutely-positioned boxes."
         // https://drafts.csswg.org/css-align/#align-abspos
         alignment = aChildRI.mFrame->IsFrameOfType(nsIFrame::eReplaced) ?
           NS_STYLE_ALIGN_START : NS_STYLE_ALIGN_STRETCH;
       }
     }
   }
 
-  // Resolve flex-start, flex-end, auto, left, right, baseline, last-baseline;
+  // Resolve flex-start, flex-end, auto, left, right, baseline, last baseline;
   if (alignment == NS_STYLE_ALIGN_FLEX_START) {
     alignment = isAxisReversed ? NS_STYLE_ALIGN_END : NS_STYLE_ALIGN_START;
   } else if (alignment == NS_STYLE_ALIGN_FLEX_END) {
     alignment = isAxisReversed ? NS_STYLE_ALIGN_START : NS_STYLE_ALIGN_END;
   } else if (alignment == NS_STYLE_ALIGN_AUTO) {
     alignment = NS_STYLE_ALIGN_START;
   } else if (alignment == NS_STYLE_ALIGN_LEFT ||
              alignment == NS_STYLE_ALIGN_RIGHT) {
@@ -2799,17 +2799,17 @@ MainAxisPositionTracker::
   // Figure out how much space we'll set aside for auto margins or
   // packing spaces, and advance past any leading packing-space.
   if (mNumAutoMarginsInMainAxis == 0 &&
       mPackingSpaceRemaining != 0 &&
       !aLine->IsEmpty()) {
     switch (mJustifyContent) {
       case NS_STYLE_JUSTIFY_BASELINE:
       case NS_STYLE_JUSTIFY_LAST_BASELINE:
-        NS_WARNING("NYI: justify-content:left/right/baseline/last-baseline");
+        NS_WARNING("NYI: justify-content:left/right/baseline/last baseline");
         MOZ_FALLTHROUGH;
       case NS_STYLE_JUSTIFY_FLEX_START:
         // All packing space should go at the end --> nothing to do here.
         break;
       case NS_STYLE_JUSTIFY_FLEX_END:
         // All packing space goes at the beginning
         mPosition += mPackingSpaceRemaining;
         break;
@@ -3000,17 +3000,17 @@ CrossAxisPositionTracker::
   // Figure out how much space we'll set aside for packing spaces, and advance
   // past any leading packing-space.
   if (mPackingSpaceRemaining != 0) {
     switch (mAlignContent) {
       case NS_STYLE_ALIGN_SELF_START:
       case NS_STYLE_ALIGN_SELF_END:
       case NS_STYLE_ALIGN_BASELINE:
       case NS_STYLE_ALIGN_LAST_BASELINE:
-        NS_WARNING("NYI: align-items/align-self:left/right/self-start/self-end/baseline/last-baseline");
+        NS_WARNING("NYI: align-items/align-self:left/right/self-start/self-end/baseline/last baseline");
         MOZ_FALLTHROUGH;
       case NS_STYLE_ALIGN_FLEX_START:
         // All packing space should go at the end --> nothing to do here.
         break;
       case NS_STYLE_ALIGN_FLEX_END:
         // All packing space goes at the beginning
         mPosition += mPackingSpaceRemaining;
         break;
@@ -3284,17 +3284,17 @@ SingleLineCrossAxisPositionTracker::
       alignSelf = NS_STYLE_ALIGN_FLEX_START;
     }
   }
 
   switch (alignSelf) {
     case NS_STYLE_ALIGN_SELF_START:
     case NS_STYLE_ALIGN_SELF_END:
     case NS_STYLE_ALIGN_LAST_BASELINE:
-      NS_WARNING("NYI: align-items/align-self:left/right/self-start/self-end/last-baseline");
+      NS_WARNING("NYI: align-items/align-self:left/right/self-start/self-end/last baseline");
       MOZ_FALLTHROUGH;
     case NS_STYLE_ALIGN_FLEX_START:
       // No space to skip over -- we're done.
       break;
     case NS_STYLE_ALIGN_FLEX_END:
       mPosition += aLine.GetLineCrossSize() - aItem.GetOuterCrossSize(mAxis);
       break;
     case NS_STYLE_ALIGN_CENTER:
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -163,17 +163,17 @@ ResolvePercentSizeParts(const nsStyleCoo
   }
 }
 
 // Synthesize a baseline from a border box.  For an alphabetical baseline
 // this is the end edge of the border box.  For a central baseline it's
 // the center of the border box.
 // https://drafts.csswg.org/css-align-3/#synthesize-baselines
 // For a first-baseline the measure is from the border-box start edge and
-// for a last-baseline the measure is from the border-box end edge.
+// for a last baseline the measure is from the border-box end edge.
 static nscoord
 SynthesizeBaselineFromBorderBox(BaselineSharingGroup aGroup,
                                 WritingMode aWM,
                                 nscoord aBorderBoxSize)
 {
   if (aGroup == BaselineSharingGroup::eFirst) {
     return aWM.IsAlphabeticalBaseline() ? aBorderBoxSize : aBorderBoxSize / 2;
   }
@@ -805,17 +805,17 @@ struct nsGridContainerFrame::GridArea
 struct nsGridContainerFrame::GridItemInfo
 {
   /**
    * Item state per axis.
    */
   enum StateBits : uint8_t {
     eIsFlexing =              0x1, // does the item span a flex track?
     eFirstBaseline =          0x2, // participate in first-baseline alignment?
-    // ditto last-baseline, mutually exclusive w. eFirstBaseline
+    // ditto last baseline, mutually exclusive w. eFirstBaseline
     eLastBaseline =           0x4,
     eIsBaselineAligned = eFirstBaseline | eLastBaseline,
     // One of e[Self|Content]Baseline is set when eIsBaselineAligned is true
     eSelfBaseline =           0x8, // is it *-self:[last-]baseline alignment?
     // Ditto *-content:[last-]baseline. Mutually exclusive w. eSelfBaseline.
     eContentBaseline =       0x10,
     eAllBaselineBits = eIsBaselineAligned | eSelfBaseline | eContentBaseline,
     // Clamp per https://drafts.csswg.org/css-grid/#min-size-auto
@@ -912,17 +912,17 @@ nsGridContainerFrame::GridItemInfo::Dump
     if (state & ItemState::eIsFlexing) {
       printf("flexing ");
     }
     if (state & ItemState::eFirstBaseline) {
       printf("baseline %s-alignment ",
              (state & ItemState::eSelfBaseline) ? "self" : "content");
     }
     if (state & ItemState::eLastBaseline) {
-      printf("last-baseline %s-alignment ",
+      printf("last baseline %s-alignment ",
              (state & ItemState::eSelfBaseline) ? "self" : "content");
     }
     if (state & ItemState::eIsBaselineAligned) {
       printf("%.2fpx", NSAppUnitsToFloatPixels(mBaselineOffset[aAxis],
                                                AppUnitsPerCSSPixel()));
     }
     printf("\n");
   };
@@ -2049,17 +2049,17 @@ struct MOZ_STACK_CLASS nsGridContainerFr
     for (; !mIter.AtEnd(); mIter.Next()) {
       nsIFrame* child = *mIter;
       nsIFrame* childFirstInFlow = child->FirstInFlow();
       DebugOnly<size_t> len = mGridItems.Length();
       for (auto& itemInfo : mSharedGridData->mGridItems) {
         if (itemInfo.mFrame == childFirstInFlow) {
           auto item = mGridItems.AppendElement(GridItemInfo(child, itemInfo.mArea));
           // Copy the item's baseline data so that the item's last fragment can do
-          // last-baseline alignment if necessary.
+          // last baseline alignment if necessary.
           item->mState[0] |= itemInfo.mState[0] & ItemState::eAllBaselineBits;
           item->mState[1] |= itemInfo.mState[1] & ItemState::eAllBaselineBits;
           item->mBaselineOffset[0] = itemInfo.mBaselineOffset[0];
           item->mBaselineOffset[1] = itemInfo.mBaselineOffset[1];
           break;
         }
       }
       MOZ_ASSERT(mGridItems.Length() == len + 1, "can't find GridItemInfo");
@@ -4261,17 +4261,17 @@ nsGridContainerFrame::Tracks::Initialize
         } else {
           state &= ~ItemState::eAllBaselineBits;
         }
       }
     }
     MOZ_ASSERT((state &
                 (ItemState::eFirstBaseline | ItemState::eLastBaseline)) !=
                (ItemState::eFirstBaseline | ItemState::eLastBaseline),
-               "baseline and last-baseline bits are mutually exclusive");
+               "baseline and last baseline bits are mutually exclusive");
     MOZ_ASSERT((state &
                 (ItemState::eSelfBaseline | ItemState::eContentBaseline)) !=
                (ItemState::eSelfBaseline | ItemState::eContentBaseline),
                "*-self and *-content baseline bits are mutually exclusive");
     MOZ_ASSERT(!(state &
                  (ItemState::eFirstBaseline | ItemState::eLastBaseline)) ==
                !(state &
                  (ItemState::eSelfBaseline | ItemState::eContentBaseline)),
@@ -4866,17 +4866,17 @@ nsGridContainerFrame::Tracks::AlignJusti
   }
 
   // Optimize the cases where we just need to set each track's position.
   nscoord pos = 0;
   bool distribute = true;
   switch (alignment) {
     case NS_STYLE_ALIGN_BASELINE:
     case NS_STYLE_ALIGN_LAST_BASELINE:
-      NS_WARNING("'NYI: baseline/last-baseline' (bug 1151204)"); // XXX
+      NS_WARNING("'NYI: baseline/last baseline' (bug 1151204)"); // XXX
       MOZ_FALLTHROUGH;
     case NS_STYLE_ALIGN_START:
       distribute = false;
       break;
     case NS_STYLE_ALIGN_END:
       pos = space;
       distribute = false;
       break;
@@ -5174,17 +5174,17 @@ nsGridContainerFrame::ReflowInFlowChild(
         aState.mFragBStart - cb.BStart(wm);
       toFragmentainerEnd = std::max(toFragmentainerEnd, 0);
     }
     cb += aContentArea.Origin(wm);
     aState.mRows.AlignBaselineSubtree(*aGridItemInfo);
     aState.mCols.AlignBaselineSubtree(*aGridItemInfo);
     // Setup [align|justify]-content:[last-]baseline related frame properties.
     // These are added to the padding in SizeComputationInput::InitOffsets.
-    // (a negative value signals the value is for 'last-baseline' and should be
+    // (a negative value signals the value is for 'last baseline' and should be
     //  added to the (logical) end padding)
     typedef const FramePropertyDescriptor<SmallValueHolder<nscoord>>* Prop;
     auto SetProp = [aGridItemInfo, aChild] (LogicalAxis aGridAxis,
                                             Prop aProp) {
       auto state = aGridItemInfo->mState[aGridAxis];
       auto baselineAdjust = (state & ItemState::eContentBaseline) ?
              aGridItemInfo->mBaselineOffset[aGridAxis] : nscoord(0);
       if (baselineAdjust < nscoord(0)) {
@@ -6180,17 +6180,17 @@ nsGridContainerFrame::Reflow(nsPresConte
   } else {
     // Only compute first-baseline if this fragment contains the first track.
     // XXXmats maybe remove this condition? bug 1306499
     BaselineSet baselines = BaselineSet::eNone;
     if (gridReflowInput.mStartRow == 0 &&
         gridReflowInput.mStartRow != gridReflowInput.mNextFragmentStartRow) {
       baselines = BaselineSet::eFirst;
     }
-    // Only compute last-baseline if this fragment contains the last track.
+    // Only compute last baseline if this fragment contains the last track.
     // XXXmats maybe remove this condition? bug 1306499
     uint32_t len = gridReflowInput.mRows.mSizes.Length();
     if (gridReflowInput.mStartRow != len &&
         gridReflowInput.mNextFragmentStartRow == len) {
       baselines = BaselineSet(baselines | BaselineSet::eLast);
     }
     Maybe<GridItemCSSOrderIterator> iter;
     Maybe<nsTArray<GridItemInfo>> gridItems;
@@ -6736,17 +6736,17 @@ nsGridContainerFrame::CalculateBaselines
   }
 
   auto lastBaseline = aTracks.mBaseline[BaselineSharingGroup::eLast];
   if (!(aBaselineSet & BaselineSet::eLast)) {
     mBaseline[axis][BaselineSharingGroup::eLast] =
       ::SynthesizeBaselineFromBorderBox(BaselineSharingGroup::eLast, aWM,
                                         aCBSize);
   } else if (lastBaseline == NS_INTRINSIC_WIDTH_UNKNOWN) {
-    // For finding items for the last-baseline we need to create a reverse
+    // For finding items for the last baseline we need to create a reverse
     // iterator ('aIter' is the forward iterator from the GridReflowInput).
     using Iter = ReverseGridItemCSSOrderIterator;
     auto orderState = aIter->ItemsAreAlreadyInOrder() ?
       Iter::OrderState::eKnownOrdered : Iter::OrderState::eKnownUnordered;
     Iter iter(this, kPrincipalList, Iter::ChildFilter::eSkipPlaceholders,
               orderState);
     iter.SetGridItemCount(aGridItems->Length());
     FindItemInGridOrderResult gridOrderLastItem =
@@ -6757,17 +6757,17 @@ nsGridContainerFrame::CalculateBaselines
     mBaseline[axis][BaselineSharingGroup::eLast] =
       SynthesizeBaseline(gridOrderLastItem,
                          axis,
                          BaselineSharingGroup::eLast,
                          aCBPhysicalSize,
                          aCBSize,
                          aWM);
   } else {
-    // We have a last-baseline group in the end track in this fragment.
+    // We have a last baseline group in the end track in this fragment.
     // Convert it from track to grid container border-box coordinates.
     MOZ_ASSERT(!aGridItems->IsEmpty());
     auto borderBoxStartToEndOfEndTrack = aCBBorderPaddingStart +
       aTracks.GridLineEdge(aFirstExcludedTrack, GridLineSide::eBeforeGridGap) -
       aTracks.GridLineEdge(aFragmentStartTrack, GridLineSide::eBeforeGridGap);
     mBaseline[axis][BaselineSharingGroup::eLast] =
       (aCBSize - borderBoxStartToEndOfEndTrack) + lastBaseline;
   }
--- a/layout/reftests/css-grid/grid-container-baselines-001-ref.html
+++ b/layout/reftests/css-grid/grid-container-baselines-001-ref.html
@@ -18,23 +18,23 @@ span {
   display: inline-grid;
   border: 1px solid black;
   font-size:12px;
 }
 span:nth-child(1) {font-size:32px; }
 span:nth-child(2) {padding-block-end:20px; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; }
+.slb { align-self:last baseline; }
 .cfb { align-content:baseline; align-self:start; }
-.clb { align-content:last-baseline; align-self:end; }
+.clb { align-content:last baseline; align-self:end; }
 .s { align-self:stretch; }
 
 .jfb { justify-self:baseline; }
-.jlb { justify-self:last-baseline; }
+.jlb { justify-self:last baseline; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; }
 .vr { writing-mode: vertical-rl; }
 .vlr { writing-mode: vertical-lr; direction:rtl; }
 .vrl { writing-mode: vertical-rl; direction:ltr; }
 
--- a/layout/reftests/css-grid/grid-container-baselines-001.html
+++ b/layout/reftests/css-grid/grid-container-baselines-001.html
@@ -36,23 +36,23 @@ span {
   background: lime;
   display: inline-block;
   border: 1px solid black;
 }
 span:nth-child(1) {font-size:32px; }
 span:nth-child(2) {font-size:12px; padding-block-end:20px;}
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; }
+.slb { align-self:last baseline; }
 .cfb { align-content:baseline; align-self:start; }
-.clb { align-content:last-baseline; align-self:end; }
+.clb { align-content:last baseline; align-self:end; }
 .s { align-self:stretch; }
 
 .jfb { justify-self:baseline; }
-.jlb { justify-self:last-baseline; }
+.jlb { justify-self:last baseline; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; }
 .vr { writing-mode: vertical-rl; }
 .vlr { writing-mode: vertical-lr; direction:rtl; }
 .vrl { writing-mode: vertical-rl; direction:ltr; }
 
--- a/layout/reftests/css-grid/grid-container-baselines-002-ref.html
+++ b/layout/reftests/css-grid/grid-container-baselines-002-ref.html
@@ -18,23 +18,23 @@ span {
   display: inline-grid;
   border: 1px solid black;
   font-size: 12px;
 }
 span:nth-child(1) { font-size:32px; }
 span:nth-child(2) { padding-block-end:20px; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; }
+.slb { align-self:last baseline; }
 .cfb { align-content:baseline; align-self:start; }
-.clb { align-content:last-baseline; align-self:end; }
+.clb { align-content:last baseline; align-self:end; }
 .s { align-self:stretch; }
 
 .jfb { justify-self:baseline; }
-.jlb { justify-self:last-baseline; }
+.jlb { justify-self:last baseline; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; }
 .vr { writing-mode: vertical-rl; }
 .vlr { writing-mode: vertical-lr; direction:rtl; }
 .vrl { writing-mode: vertical-rl; direction:ltr; }
 
--- a/layout/reftests/css-grid/grid-container-baselines-002.html
+++ b/layout/reftests/css-grid/grid-container-baselines-002.html
@@ -38,23 +38,23 @@ span {
   background: lime;
   display: inline-block;
   border: 1px solid black;
 }
 span:nth-child(1) {font-size:32px; }
 span:nth-child(2) {font-size:12px; padding-block-end:20px;}
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; }
+.slb { align-self:last baseline; }
 .cfb { align-content:baseline; align-self:start; }
-.clb { align-content:last-baseline; align-self:end; }
+.clb { align-content:last baseline; align-self:end; }
 .s { align-self:stretch; }
 
 .jfb { justify-self:baseline; }
-.jlb { justify-self:last-baseline; }
+.jlb { justify-self:last baseline; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; }
 .vr { writing-mode: vertical-rl; }
 .vlr { writing-mode: vertical-lr; direction:rtl; }
 .vrl { writing-mode: vertical-rl; direction:ltr; }
 
--- a/layout/reftests/css-grid/grid-container-baselines-003-ref.html
+++ b/layout/reftests/css-grid/grid-container-baselines-003-ref.html
@@ -52,17 +52,17 @@ span.i { font-size:12px; grid-column:2; 
   border: 1px solid;
   margin: 1px;
 }
 /* don't clamp grid item automatic minimum size */
 * {
   min-width: 0;
   min-height: 0;
 }
-.slb { align-self:last-baseline; align-content:self-end; }
+.slb { align-self:last baseline; align-content:self-end; }
 
 </style>
 </head>
 <body>
 
 A<div class="ib">
   <div class="ib" style="height:120px; width:56px;"><span
      class="a f" style="width:30px; padding-bottom:5px;">A<br>B</span>
--- a/layout/reftests/css-grid/grid-container-baselines-003.html
+++ b/layout/reftests/css-grid/grid-container-baselines-003.html
@@ -39,19 +39,19 @@ html,body {
 
 span:nth-of-type(1) { font-size:32px; }
 span:nth-of-type(2) { font-size:36px; }
 span:nth-of-type(3) { font-size:48px; }
 span:nth-of-type(4) { font-size:24px; }
 span.i { font-size:12px; grid-column:2; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end; }
+.slb { align-self:last baseline; align-content:self-end; }
 .jfb { justify-self:baseline; justify-content:self-end; }
-.jlb { justify-self:last-baseline; justify-content:self-end; }
+.jlb { justify-self:last baseline; justify-content:self-end; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-content-baseline-001-ref.html
+++ b/layout/reftests/css-grid/grid-item-content-baseline-001-ref.html
@@ -34,17 +34,17 @@ span {
 
 span:nth-child(1) { font-size:12px; }
 span:nth-child(2) { font-size:32px; }
 span:nth-child(3) { font-size:10px; }
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-self:baseline; justify-self:baseline; }
-.lb { align-self:last-baseline; justify-self:last-baseline; }
+.lb { align-self:last baseline; justify-self:last baseline; }
 .s  { align-self:self-stretch; justify-self:self-stretch; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
--- a/layout/reftests/css-grid/grid-item-content-baseline-001.html
+++ b/layout/reftests/css-grid/grid-item-content-baseline-001.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>CSS Grid Test: align-content:baseline/last-baseline</title>
+  <title>CSS Grid Test: align-content:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-content">
   <link rel="match" href="grid-item-content-baseline-001-ref.html">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
@@ -35,17 +35,17 @@ span {
 
 span:nth-child(1) { font-size:12px; }
 span:nth-child(2) { font-size:32px; }
 span:nth-child(3) { font-size:10px; }
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-content:baseline; align-self:self-start; justify-self:self-start; }
-.lb { align-content:last-baseline; align-self:self-end; justify-self:self-end; }
+.lb { align-content:last baseline; align-self:self-end; justify-self:self-end; }
 .s  { align-self:stretch; justify-self:stretch; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
--- a/layout/reftests/css-grid/grid-item-content-baseline-002-ref.html
+++ b/layout/reftests/css-grid/grid-item-content-baseline-002-ref.html
@@ -34,17 +34,17 @@ span {
 
 span:nth-child(1) { font-size:12px; }
 span:nth-child(2) { font-size:32px; }
 span:nth-child(3) { font-size:10px; }
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-self:baseline; justify-self:baseline; }
-.lb { align-self:last-baseline; justify-self:last-baseline; }
+.lb { align-self:last baseline; justify-self:last baseline; }
 .s  { align-self:self-stretch; justify-self:self-stretch; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
--- a/layout/reftests/css-grid/grid-item-content-baseline-002.html
+++ b/layout/reftests/css-grid/grid-item-content-baseline-002.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>CSS Grid Test: align-content:baseline/last-baseline</title>
+  <title>CSS Grid Test: align-content:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-content">
   <link rel="match" href="grid-item-content-baseline-001-ref.html">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
@@ -37,17 +37,17 @@ span {
 
 span:nth-child(1) { font-size:12px; }
 span:nth-child(2) { font-size:32px; }
 span:nth-child(3) { font-size:10px; }
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-content:baseline; align-self:self-start; justify-self:self-start; }
-.lb { align-content:last-baseline; align-self:self-end; justify-self:self-end; }
+.lb { align-content:last baseline; align-self:self-end; justify-self:self-end; }
 .s  { align-self:stretch; justify-self:stretch; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-001-ref.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-001-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>Reference: mixed align-content/self:baseline/last-baseline</title>
+  <title>Reference: mixed align-content/self:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
 
 .grid {
@@ -35,21 +35,21 @@ span:nth-child(1) { font-size:32px; }
 span:nth-child(2) { font-size:12px; }
 span:nth-child(3) { font-size:10px; }
 span:nth-child(4) { font-size:24px; }
 
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-self:baseline; justify-self:self-start; }
-.lb { align-self:last-baseline; justify-self:self-end; }
+.lb { align-self:last baseline; justify-self:self-end; }
 .s  { justify-self:stretch; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end;}
+.slb { align-self:last baseline; align-content:self-end;}
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-001.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-001.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>CSS Grid Test: mixed align-content/self:baseline/last-baseline</title>
+  <title>CSS Grid Test: mixed align-content/self:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-content">
   <link rel="match" href="grid-item-mixed-baseline-001-ref.html">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
@@ -37,21 +37,21 @@ span:nth-child(1) { font-size:32px; }
 span:nth-child(2) { font-size:12px; }
 span:nth-child(3) { font-size:10px; }
 span:nth-child(4) { font-size:24px; }
 
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-content:baseline; align-self:self-start; justify-self:self-start; }
-.lb { align-content:last-baseline; align-self:self-end; justify-self:self-end; }
+.lb { align-content:last baseline; align-self:self-end; justify-self:self-end; }
 .s  { align-self:stretch; justify-self:stretch; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end;}
+.slb { align-self:last baseline; align-content:self-end;}
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-002-ref.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-002-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>Reference: mixed align-content/self:baseline/last-baseline</title>
+  <title>Reference: mixed align-content/self:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
 
 .grid {
@@ -39,21 +39,21 @@ span:nth-child(1) { font-size:32px; }
 span:nth-child(2) { font-size:12px; }
 span:nth-child(3) { font-size:10px; }
 span:nth-child(4) { font-size:24px; }
 
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-self:baseline; justify-self:self-start; }
-.lb { align-self:last-baseline; justify-self:self-end; }
+.lb { align-self:last baseline; justify-self:self-end; }
 .s  { justify-self:stretch; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end;}
+.slb { align-self:last baseline; align-content:self-end;}
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-002.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-002.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>CSS Grid Test: mixed align-content/self:baseline/last-baseline</title>
+  <title>CSS Grid Test: mixed align-content/self:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-content">
   <link rel="match" href="grid-item-mixed-baseline-002-ref.html">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
@@ -41,21 +41,21 @@ span:nth-child(1) { font-size:32px; }
 span:nth-child(2) { font-size:12px; }
 span:nth-child(3) { font-size:10px; }
 span:nth-child(4) { font-size:24px; }
 
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-content:baseline; align-self:self-start; justify-self:self-start; }
-.lb { align-content:last-baseline; align-self:self-end; justify-self:self-end; }
+.lb { align-content:last baseline; align-self:self-end; justify-self:self-end; }
 .s  { align-self:stretch; justify-self:stretch; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end;}
+.slb { align-self:last baseline; align-content:self-end;}
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-003-ref.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-003-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>Reference: mixed align-content/self:baseline/last-baseline</title>
+  <title>Reference: mixed align-content/self:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
 
 .grid {
@@ -39,21 +39,21 @@ span:nth-child(1) { font-size:32px; }
 span:nth-child(2) { font-size:12px; }
 span:nth-child(3) { font-size:10px; }
 span:nth-child(4) { font-size:24px; }
 
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-self:baseline; justify-self:self-start; }
-.lb { align-self:last-baseline; justify-self:self-end; }
+.lb { align-self:last baseline; justify-self:self-end; }
 .s  { justify-self:stretch; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end;}
+.slb { align-self:last baseline; align-content:self-end;}
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-003.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-003.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>CSS Grid Test: mixed align-content/self:baseline/last-baseline</title>
+  <title>CSS Grid Test: mixed align-content/self:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-content">
   <link rel="match" href="grid-item-mixed-baseline-003-ref.html">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
@@ -41,21 +41,21 @@ span:nth-child(1) { font-size:32px; }
 span:nth-child(2) { font-size:12px; }
 span:nth-child(3) { font-size:10px; }
 span:nth-child(4) { font-size:24px; }
 
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-content:baseline; align-self:self-start; justify-self:self-start; }
-.lb { align-content:last-baseline; align-self:self-end; justify-self:self-end; }
+.lb { align-content:last baseline; align-self:self-end; justify-self:self-end; }
 .s  { align-self:stretch; justify-self:stretch; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end;}
+.slb { align-self:last baseline; align-content:self-end;}
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-004-ref.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-004-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>Reference: mixed align-content/self:baseline/last-baseline in fragmentated grid</title>
+  <title>Reference: mixed align-content/self:baseline/last baseline in fragmentated grid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
 
 .columns {
@@ -63,21 +63,21 @@ span:nth-child(3) { font-size:10px; }
 span:nth-child(4) { font-size:24px; }
 
 .g2 span:nth-child(4) { font-size:24px; }
 
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-content:baseline; align-self:self-start; justify-self:self-start; }
-.lb { align-content:last-baseline; align-self:self-end; justify-self:self-end; }
+.lb { align-content:last baseline; align-self:self-end; justify-self:self-end; }
 .s  { align-self:stretch; justify-self:stretch; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end; }
+.slb { align-self:last baseline; align-content:self-end; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-mixed-baseline-004.html
+++ b/layout/reftests/css-grid/grid-item-mixed-baseline-004.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>CSS Grid Test: mixed align-content/self:baseline/last-baseline in fragmentated grid</title>
+  <title>CSS Grid Test: mixed align-content/self:baseline/last baseline in fragmentated grid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256429">
   <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-content">
   <link rel="match" href="grid-item-mixed-baseline-004-ref.html">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; font-family: Ahem; padding:0; margin:0;
 }
@@ -48,21 +48,21 @@ span:nth-child(1) { font-size:32px; }
 span:nth-child(2) { font-size:12px; }
 span:nth-child(3) { font-size:10px; }
 span:nth-child(4) { font-size:24px; }
 
 .pbs { padding-block-start: 15px; margin-block-start: 5px; }
 .pbe { padding-block-end: 7px; margin-block-end: 3px; }
 
 .fb { align-content:baseline; align-self:self-start; justify-self:self-start; }
-.lb { align-content:last-baseline; align-self:self-end; justify-self:self-end; }
+.lb { align-content:last baseline; align-self:self-end; justify-self:self-end; }
 .s  { align-self:stretch; justify-self:stretch; }
 
 .sfb { align-self:baseline; }
-.slb { align-self:last-baseline; align-content:self-end; }
+.slb { align-self:last baseline; align-content:self-end; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-self-baseline-001-ref.html
+++ b/layout/reftests/css-grid/grid-item-self-baseline-001-ref.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>Reference: align-self/justify-self:baseline/last-baseline</title>
+  <title>Reference: align-self/justify-self:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1221525">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 
 .grid {
   display: grid;
@@ -36,17 +36,17 @@ span {
 span:nth-child(1) { font-size:12px; }
 span:nth-child(2) { font-size:16px; }
 span:nth-child(3) { font-size:24px; }
 span:nth-child(4) { font-size:32px; }
 .pbe { padding-block-end:20px; }
 .pbs { padding-block-start:20px; }
 
 .fb { align-self:baseline; }
-.lb { align-self:last-baseline; }
+.lb { align-self:last baseline; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/css-grid/grid-item-self-baseline-001.html
+++ b/layout/reftests/css-grid/grid-item-self-baseline-001.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <html><head>
   <meta charset="utf-8">
-  <title>CSS Grid Test: align-self/justify-self:baseline/last-baseline</title>
+  <title>CSS Grid Test: align-self/justify-self:baseline/last baseline</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1221525">
   <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-self">
   <link rel="match" href="grid-item-self-baseline-001-ref.html">
   <style type="text/css">
 html,body {
     color:black; background-color:white; font-size:16px; padding:0; margin:0;
 }
 
@@ -37,20 +37,20 @@ span {
 span:nth-child(1) { font-size:12px; }
 span:nth-child(2) { font-size:16px; }
 span:nth-child(3) { font-size:24px; }
 span:nth-child(4) { font-size:32px; }
 .pbe { padding-block-end:20px; }
 .pbs { padding-block-start:20px; }
 
 .fb { align-self:baseline; }
-.lb { align-self:last-baseline; }
+.lb { align-self:last baseline; }
 
 .jfb { justify-self:baseline; }
-.jlb { justify-self:last-baseline; }
+.jlb { justify-self:last baseline; }
 
 .hl { writing-mode: horizontal-tb; direction:ltr; }
 .hr { writing-mode: horizontal-tb; direction:rtl; }
 .vl { writing-mode: vertical-lr; text-orientation: sideways; }
 .vr { writing-mode: vertical-rl; text-orientation: sideways; }
 .vlr { writing-mode: vertical-lr; direction:rtl; text-orientation: sideways; }
 .vrl { writing-mode: vertical-rl; direction:ltr; text-orientation: sideways; }
 
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-001.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-002.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003-ref.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-003.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004-ref.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-004.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-005.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-006.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007-ref.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-007.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008-ref.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-008.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001-ref.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-001.html
@@ -50,17 +50,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -78,17 +78,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-rtl-002.html
@@ -50,17 +50,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -78,17 +78,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-001.html
@@ -50,17 +50,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -78,17 +78,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002-ref.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignCenter"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignCenter"><!--stretch (+ align-self:center)--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-content-vertWM-002.html
@@ -50,17 +50,17 @@
   <div class="big">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -78,17 +78,17 @@
   <div class="small">
     <!-- The various align-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="align-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="align-content: baseline"><div></div></div>
-    <div class="container" style="align-content: last-baseline"><div></div></div>
+    <div class="container" style="align-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="align-content: space-between"><div></div></div>
     <div class="container" style="align-content: space-around"><div></div></div>
     <div class="container" style="align-content: space-evenly"><div></div></div>
     <div class="container" style="align-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001-ref.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-001.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002-ref.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-002.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003-ref.html
@@ -51,17 +51,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -77,17 +77,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-003.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004-ref.html
@@ -51,17 +51,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -77,17 +77,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-004.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005-ref.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-005.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006-ref.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-006.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007-ref.html
@@ -51,17 +51,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -77,17 +77,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-007.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008-ref.html
@@ -51,17 +51,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -77,17 +77,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-008.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001-ref.html
@@ -51,17 +51,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -77,17 +77,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-001.html
@@ -47,17 +47,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -73,17 +73,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002-ref.html
@@ -51,17 +51,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -77,17 +77,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-002.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003-ref.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-003.html
@@ -47,17 +47,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -73,17 +73,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004-ref.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-rtl-004.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-001-ref.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-001.html
@@ -47,17 +47,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -73,17 +73,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-002-ref.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-002.html
@@ -48,17 +48,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -74,17 +74,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003-ref.html
@@ -51,17 +51,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
@@ -77,17 +77,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignStart"><!--self-start--></div></div>
     <div class="container"><div class="alignEnd"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-003.html
@@ -47,17 +47,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -73,17 +73,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004-ref.html
@@ -51,17 +51,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
@@ -77,17 +77,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div class="alignStart"><!--auto--></div></div>
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <self-position>, part 1: -->
     <div class="container"><div class="alignCenter"><!--center--></div></div>
     <div class="container"><div class="alignStart"><!--start--></div></div>
     <div class="container"><div class="alignEnd"><!--end--></div></div>
     <div class="container"><div class="alignEnd"><!--self-start--></div></div>
     <div class="container"><div class="alignStart"><!--self-end--></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-align-self-vertWM-004.html
@@ -49,17 +49,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
@@ -75,17 +75,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-align-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="align-self: auto"></div></div>
     <div class="container"><div style="align-self: normal"></div></div>
     <div class="container"><div style="align-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="align-self: baseline"></div></div>
-    <div class="container"><div style="align-self: last-baseline"></div></div>
+    <div class="container"><div style="align-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="align-self: center"></div></div>
     <div class="container"><div style="align-self: start"></div></div>
     <div class="container"><div style="align-self: end"></div></div>
     <div class="container"><div style="align-self: self-start"></div></div>
     <div class="container"><div style="align-self: self-end"></div></div>
     <br>
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-001.html
@@ -44,17 +44,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -72,17 +72,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-002.html
@@ -44,17 +44,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -72,17 +72,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-003.html
@@ -44,17 +44,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -72,17 +72,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-004.html
@@ -44,17 +44,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -72,17 +72,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-005.html
@@ -44,17 +44,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -72,17 +72,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-006.html
@@ -44,17 +44,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -72,17 +72,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-007.html
@@ -44,17 +44,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -72,17 +72,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignEnd"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignEnd"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-008.html
@@ -44,17 +44,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -72,17 +72,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-001.html
@@ -45,17 +45,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -73,17 +73,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002-ref.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-rtl-002.html
@@ -45,17 +45,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -73,17 +73,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001-ref.html
@@ -49,17 +49,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -77,17 +77,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-001.html
@@ -45,17 +45,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -73,17 +73,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002-ref.html
@@ -46,17 +46,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
@@ -74,17 +74,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container"><div class="alignStart"><!--normal--></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div class="alignStart"><!--baseline--></div></div>
-    <div class="container"><div class="alignEnd"><!--last-baseline--></div></div>
+    <div class="container"><div class="alignEnd"><!--last baseline--></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container"><div class="alignStart"><!--space-between--></div></div>
     <div class="container"><div class="alignCenter"><!--space-around--></div></div>
     <div class="container"><div class="alignCenter"><!--space-evenly--></div></div>
     <div class="container"><div class="alignStart"><!--stretch--></div></div>
     <br>
     <!-- <content-position>, part 1: -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-content-vertWM-002.html
@@ -45,17 +45,17 @@
   <div class="big">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
@@ -73,17 +73,17 @@
   <div class="small">
     <!-- The various justify-content values, from
          https://www.w3.org/TR/css-align-3/#propdef-align-content -->
     <!-- normal -->
     <div class="container" style="justify-content: normal"><div></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container" style="justify-content: baseline"><div></div></div>
-    <div class="container" style="justify-content: last-baseline"><div></div></div>
+    <div class="container" style="justify-content: last baseline"><div></div></div>
     <br>
     <!-- <content-distribution> -->
     <div class="container" style="justify-content: space-between"><div></div></div>
     <div class="container" style="justify-content: space-around"><div></div></div>
     <div class="container" style="justify-content: space-evenly"><div></div></div>
     <div class="container" style="justify-content: stretch"><div></div></div>
     <br>
     <!-- <content-position>, part 1 -->
--- a/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-self-001.html
+++ b/layout/reftests/w3c-css/submitted/align3/flex-abspos-staticpos-justify-self-001.html
@@ -46,17 +46,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last-baseline"></div></div>
+    <div class="container"><div style="justify-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>
@@ -72,17 +72,17 @@
          https://www.w3.org/TR/css-align-3/#propdef-justify-self -->
     <!-- auto | normal | stretch -->
     <div class="container"><div style="justify-self: auto"></div></div>
     <div class="container"><div style="justify-self: normal"></div></div>
     <div class="container"><div style="justify-self: stretch"></div></div>
     <br>
     <!-- <baseline-position> -->
     <div class="container"><div style="justify-self: baseline"></div></div>
-    <div class="container"><div style="justify-self: last-baseline"></div></div>
+    <div class="container"><div style="justify-self: last baseline"></div></div>
     <br>
     <!-- <self-position>, part 1 -->
     <div class="container"><div style="justify-self: center"></div></div>
     <div class="container"><div style="justify-self: start"></div></div>
     <div class="container"><div style="justify-self: end"></div></div>
     <div class="container"><div style="justify-self: self-start"></div></div>
     <div class="container"><div style="justify-self: self-end"></div></div>
     <br>