Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset d935c88d79d6 (bug 1237754) for OS X refrest failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-01-18 08:54:13 +01:00
parent 643e40a735
commit 4a40c9ed19
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsGridContainerFrame.cpp
View File

@ -2936,17 +2936,15 @@ nsGridContainerFrame::Tracks::AlignJustifyContent(
const bool isAlign = mAxis == eLogicalAxisBlock;
auto stylePos = aReflowState.mStylePosition;
auto valueAndFallback = isAlign ? stylePos->ComputedAlignContent() :
stylePos->ComputedJustifyContent();
const auto valueAndFallback = isAlign ?
stylePos->ComputedAlignContent() :
stylePos->ComputedJustifyContent();
WritingMode wm = aReflowState.GetWritingMode();
bool overflowSafe;
auto alignment = ::GetAlignJustifyValue(valueAndFallback, wm, isAlign,
&overflowSafe);
if (alignment == NS_STYLE_ALIGN_NORMAL) {
MOZ_ASSERT(valueAndFallback == NS_STYLE_ALIGN_NORMAL,
"*-content:normal cannot be specified with explicit fallback");
alignment = isAlign ? NS_STYLE_ALIGN_STRETCH : NS_STYLE_ALIGN_START;
valueAndFallback = alignment; // we may need a fallback for 'stretch' below
alignment = NS_STYLE_ALIGN_START;
}
// Compute the free space and count auto-sized tracks.