diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index ded1c5c5bb1b..58074312017d 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -505,6 +505,9 @@ nsHTMLScrollFrame::ReflowScrolledFrame(ScrollReflowState* aState, kidReflowState.SetComputedBSize(computedBSize); kidReflowState.ComputedMinBSize() = computedMinBSize; kidReflowState.ComputedMaxBSize() = computedMaxBSize; + if (aState->mReflowState.IsBResize()) { + kidReflowState.SetBResize(true); + } // Temporarily set mHasHorizontalScrollbar/mHasVerticalScrollbar to // reflect our assumptions while we reflow the child. diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index eed6e90c5008..cbca3fcc1de9 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -1604,7 +1604,7 @@ nsChangeHint nsStylePosition::CalcDifference(const nsStylePosition& aOther) cons // clear ancestor intrinsics! return NS_CombineHint(hint, nsChangeHint_NeedReflow | nsChangeHint_ClearAncestorIntrinsics | - nsChangeHint_ClearDescendantIntrinsics | nsChangeHint_NeedDirtyReflow | + nsChangeHint_ClearDescendantIntrinsics | nsChangeHint_ReflowChangesSizeOrPosition); }