corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge inbound to m-c a=merge

Browse Source 
MozReview-Commit-ID: 4SpokMW1d3I
This commit is contained in:
Wes Kocher
2017-05-02 17:35:06 -07:00
parent 72ab97ac4a 516abcaf09
commit 2267568d7e
107 changed files with 2453 additions and 2649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/ReflowInput.cpp
View File

@@ -2201,7 +2201,8 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
} else {
// Get the containing block reflow state
const ReflowInput* cbrs = mCBReflowInput;
NS_ASSERTION(nullptr != cbrs, "no containing block");
MOZ_ASSERT(cbrs, "no containing block");
MOZ_ASSERT(mFrame->GetParent());
// If we weren't given a containing block width and height, then
// compute one
@@ -2398,7 +2399,7 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
}
nsIFrame* alignCB = mFrame->GetParent();
if (alignCB && alignCB->IsTableWrapperFrame() && alignCB->GetParent()) {
if (alignCB->IsTableWrapperFrame() && alignCB->GetParent()) {
// XXX grid-specific for now; maybe remove this check after we address bug 799725
if (alignCB->GetParent()->IsGridContainerFrame()) {
alignCB = alignCB->GetParent();
@@ -2433,7 +2434,7 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eShrinkWrap);
}
if (alignCB && alignCB->IsFlexContainerFrame()) {
if (alignCB->IsFlexContainerFrame()) {
computeSizeFlags =
ComputeSizeFlags(computeSizeFlags | ComputeSizeFlags::eShrinkWrap);
@@ -2474,8 +2475,7 @@ ReflowInput::InitConstraints(nsPresContext* aPresContext,
// margin calculations.
if (isBlock && !IsSideCaption(mFrame, mStyleDisplay, cbwm) &&
mStyleDisplay->mDisplay != StyleDisplay::InlineTable &&
(!alignCB || (!alignCB->IsFlexContainerFrame() &&
!alignCB->IsGridContainerFrame()))) {
!alignCB->IsFlexOrGridContainer()) {
CalculateBlockSideMargins(aFrameType);
}
}