diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 62e3e55e686..dc20533964b 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext, rv = ChildIncrementalReflow(state); } } - else if (eReflowReason_Resize == state.reason) { + else if ((eReflowReason_Resize == state.reason) || + (eReflowReason_StyleChange == state.reason)) { DrainOverflowLines(); rv = ResizeReflow(state); } diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 62e3e55e686..dc20533964b 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext, rv = ChildIncrementalReflow(state); } } - else if (eReflowReason_Resize == state.reason) { + else if ((eReflowReason_Resize == state.reason) || + (eReflowReason_StyleChange == state.reason)) { DrainOverflowLines(); rv = ResizeReflow(state); } diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 62e3e55e686..dc20533964b 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext, rv = ChildIncrementalReflow(state); } } - else if (eReflowReason_Resize == state.reason) { + else if ((eReflowReason_Resize == state.reason) || + (eReflowReason_StyleChange == state.reason)) { DrainOverflowLines(); rv = ResizeReflow(state); } diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp index 6a9009e1a8c..f51fc22b9db 100644 --- a/mozilla/layout/generic/nsInlineFrame.cpp +++ b/mozilla/layout/generic/nsInlineFrame.cpp @@ -610,7 +610,8 @@ nsInlineFrame::Reflow(nsIPresContext& aPresContext, aStatus = ChildIncrementalReflow(state, inlineReflow); } } - else if (eReflowReason_Resize == state.reason) { + else if ((eReflowReason_Resize == state.reason) || + (eReflowReason_StyleChange == state.reason)) { DrainOverflowLists(aPresContext); aStatus = ResizeReflow(state, inlineReflow); } diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 62e3e55e686..dc20533964b 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext, rv = ChildIncrementalReflow(state); } } - else if (eReflowReason_Resize == state.reason) { + else if ((eReflowReason_Resize == state.reason) || + (eReflowReason_StyleChange == state.reason)) { DrainOverflowLines(); rv = ResizeReflow(state); } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 62e3e55e686..dc20533964b 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext, rv = ChildIncrementalReflow(state); } } - else if (eReflowReason_Resize == state.reason) { + else if ((eReflowReason_Resize == state.reason) || + (eReflowReason_StyleChange == state.reason)) { DrainOverflowLines(); rv = ResizeReflow(state); } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 62e3e55e686..dc20533964b 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext, rv = ChildIncrementalReflow(state); } } - else if (eReflowReason_Resize == state.reason) { + else if ((eReflowReason_Resize == state.reason) || + (eReflowReason_StyleChange == state.reason)) { DrainOverflowLines(); rv = ResizeReflow(state); } diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp index 6a9009e1a8c..f51fc22b9db 100644 --- a/mozilla/layout/html/base/src/nsInlineFrame.cpp +++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp @@ -610,7 +610,8 @@ nsInlineFrame::Reflow(nsIPresContext& aPresContext, aStatus = ChildIncrementalReflow(state, inlineReflow); } } - else if (eReflowReason_Resize == state.reason) { + else if ((eReflowReason_Resize == state.reason) || + (eReflowReason_StyleChange == state.reason)) { DrainOverflowLists(aPresContext); aStatus = ResizeReflow(state, inlineReflow); }