Bug 1447166 part 4 - [css-grid] Make InitializeItemBaselines iterate the GridItemInfo array instead of using a CSSOrderAwareFrameIterator (idempotent change). r=dholbert

This commit is contained in:
Mats Palmgren 2018-03-24 23:03:44 +01:00
Родитель 5a7c9748bb
Коммит 5426506598
1 изменённых файлов: 2 добавлений и 5 удалений

Просмотреть файл

@ -4020,11 +4020,8 @@ nsGridContainerFrame::Tracks::InitializeItemBaselines(
nsTArray<ItemBaselineData> lastBaselineItems; nsTArray<ItemBaselineData> lastBaselineItems;
WritingMode wm = aState.mWM; WritingMode wm = aState.mWM;
ComputedStyle* containerSC = aState.mFrame->Style(); ComputedStyle* containerSC = aState.mFrame->Style();
CSSOrderAwareFrameIterator& iter = aState.mIter; for (GridItemInfo& gridItem : aGridItems) {
iter.Reset(); nsIFrame* child = gridItem.mFrame;
for (; !iter.AtEnd(); iter.Next()) {
nsIFrame* child = *iter;
GridItemInfo& gridItem = aGridItems[iter.ItemIndex()];
uint32_t baselineTrack = kAutoLine; uint32_t baselineTrack = kAutoLine;
auto state = ItemState(0); auto state = ItemState(0);
auto childWM = child->GetWritingMode(); auto childWM = child->GetWritingMode();