mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1134432 part 1 - Suppress break inside ruby when calculating intrinsic isize. r=dbaron
Breaks during reflow have been suppressed in bug 1098272.
This commit is contained in:
parent
8f99dc2e85
commit
a18446ea1b
@ -164,14 +164,18 @@ BRFrame::Reflow(nsPresContext* aPresContext,
|
||||
BRFrame::AddInlineMinISize(nsRenderingContext *aRenderingContext,
|
||||
nsIFrame::InlineMinISizeData *aData)
|
||||
{
|
||||
aData->ForceBreak(aRenderingContext);
|
||||
if (!StyleContext()->IsInlineDescendantOfRuby()) {
|
||||
aData->ForceBreak(aRenderingContext);
|
||||
}
|
||||
}
|
||||
|
||||
/* virtual */ void
|
||||
BRFrame::AddInlinePrefISize(nsRenderingContext *aRenderingContext,
|
||||
nsIFrame::InlinePrefISizeData *aData)
|
||||
{
|
||||
aData->ForceBreak(aRenderingContext);
|
||||
if (!StyleContext()->IsInlineDescendantOfRuby()) {
|
||||
aData->ForceBreak(aRenderingContext);
|
||||
}
|
||||
}
|
||||
|
||||
/* virtual */ nscoord
|
||||
|
@ -3917,6 +3917,7 @@ nsFrame::AddInlineMinISize(nsRenderingContext *aRenderingContext,
|
||||
NS_ASSERTION(GetParent(), "Must have a parent if we get here!");
|
||||
nsIFrame* parent = GetParent();
|
||||
bool canBreak = !CanContinueTextRun() &&
|
||||
!parent->StyleContext()->IsInlineDescendantOfRuby() &&
|
||||
parent->StyleText()->WhiteSpaceCanWrap(parent);
|
||||
|
||||
if (canBreak)
|
||||
|
Loading…
Reference in New Issue
Block a user