wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 812143 Include text-decoration rect as solid style in text frame's overflow rect when the style is none r=dbaron

Browse Source
This commit is contained in:
Masayuki Nakano 2012-12-28 09:00:50 +09:00
parent 1d548be2f1
commit d3fb533d82
1 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
layout/generic/nsTextFrameThebes.cpp
View File

@ -4740,8 +4740,7 @@ nsTextFrame::GetTextDecorations(
frameTopOffset += f->GetRect().y - f->GetRelativeOffset().y;
const uint8_t style = styleText->GetDecorationStyle();
// Accumulate only elements that have decorations with a genuine style
if (textDecorations && style != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
if (textDecorations) {
nscolor color;
if (useOverride) {
color = overrideColor;
@ -4815,34 +4814,38 @@ nsTextFrame::UnionAdditionalOverflow(nsPresContext* aPresContext,
nsIFrame* firstLetterFrame = aBlockReflowState.frame;
uint8_t decorationStyle = firstLetterFrame->GetStyleContext()->
GetStyleTextReset()->GetDecorationStyle();
if (decorationStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
nsFontMetrics* fontMetrics = aProvider.GetFontMetrics();
nscoord underlineOffset, underlineSize;
fontMetrics->GetUnderline(underlineOffset, underlineSize);
nscoord maxAscent = fontMetrics->MaxAscent();
gfxFloat appUnitsPerDevUnit = aPresContext->AppUnitsPerDevPixel();
gfxFloat gfxWidth = aVisualOverflowRect->width / appUnitsPerDevUnit;
gfxFloat gfxAscent = gfxFloat(mAscent) / appUnitsPerDevUnit;
gfxFloat gfxMaxAscent = maxAscent / appUnitsPerDevUnit;
gfxFloat gfxUnderlineSize = underlineSize / appUnitsPerDevUnit;
gfxFloat gfxUnderlineOffset = underlineOffset / appUnitsPerDevUnit;
nsRect underlineRect =
nsCSSRendering::GetTextDecorationRect(aPresContext,
gfxSize(gfxWidth, gfxUnderlineSize), gfxAscent, gfxUnderlineOffset,
NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, decorationStyle);
nsRect overlineRect =
nsCSSRendering::GetTextDecorationRect(aPresContext,
gfxSize(gfxWidth, gfxUnderlineSize), gfxAscent, gfxMaxAscent,
NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, decorationStyle);
aVisualOverflowRect->UnionRect(*aVisualOverflowRect, underlineRect);
aVisualOverflowRect->UnionRect(*aVisualOverflowRect, overlineRect);
// XXX If strikeoutSize is much thicker than the underlineSize, it may
// cause overflowing from the overflow rect. However, such case
// isn't realistic, we don't need to compute it now.
// If the style is none, let's include decoration line rect as solid style
// since changing the style from none to solid/dotted/dashed doesn't cause
// reflow.
if (decorationStyle == NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
decorationStyle = NS_STYLE_TEXT_DECORATION_STYLE_SOLID;
}
nsFontMetrics* fontMetrics = aProvider.GetFontMetrics();
nscoord underlineOffset, underlineSize;
fontMetrics->GetUnderline(underlineOffset, underlineSize);
nscoord maxAscent = fontMetrics->MaxAscent();
gfxFloat appUnitsPerDevUnit = aPresContext->AppUnitsPerDevPixel();
gfxFloat gfxWidth = aVisualOverflowRect->width / appUnitsPerDevUnit;
gfxFloat gfxAscent = gfxFloat(mAscent) / appUnitsPerDevUnit;
gfxFloat gfxMaxAscent = maxAscent / appUnitsPerDevUnit;
gfxFloat gfxUnderlineSize = underlineSize / appUnitsPerDevUnit;
gfxFloat gfxUnderlineOffset = underlineOffset / appUnitsPerDevUnit;
nsRect underlineRect =
nsCSSRendering::GetTextDecorationRect(aPresContext,
gfxSize(gfxWidth, gfxUnderlineSize), gfxAscent, gfxUnderlineOffset,
NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, decorationStyle);
nsRect overlineRect =
nsCSSRendering::GetTextDecorationRect(aPresContext,
gfxSize(gfxWidth, gfxUnderlineSize), gfxAscent, gfxMaxAscent,
NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, decorationStyle);
aVisualOverflowRect->UnionRect(*aVisualOverflowRect, underlineRect);
aVisualOverflowRect->UnionRect(*aVisualOverflowRect, overlineRect);
// XXX If strikeoutSize is much thicker than the underlineSize, it may
// cause overflowing from the overflow rect. However, such case
// isn't realistic, we don't need to compute it now.
}
if (aIncludeTextDecorations) {
// Since CSS 2.1 requires that text-decoration defined on ancestors maintain
@ -4864,6 +4867,13 @@ nsTextFrame::UnionAdditionalOverflow(nsPresContext* aPresContext,
// containing all of them, in this frame's coordinate space
for (uint32_t i = 0; i < textDecs.mUnderlines.Length(); ++i) {
const LineDecoration& dec = textDecs.mUnderlines[i];
uint8_t decorationStyle = dec.mStyle;
// If the style is solid, let's include decoration line rect of solid
// style since changing the style from none to solid/dotted/dashed
// doesn't cause reflow.
if (decorationStyle == NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
decorationStyle = NS_STYLE_TEXT_DECORATION_STYLE_SOLID;
}
float inflation = nsLayoutUtils::FontSizeInflationInner(dec.mFrame,
inflationMinFontSize);
@ -4874,7 +4884,7 @@ nsTextFrame::UnionAdditionalOverflow(nsPresContext* aPresContext,
nsCSSRendering::GetTextDecorationRect(aPresContext,
gfxSize(gfxWidth, metrics.underlineSize),
ascent, metrics.underlineOffset,
NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, dec.mStyle) +
NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, decorationStyle) +
nsPoint(0, -dec.mBaselineOffset);
top = NS_MIN(decorationRect.y, top);
@ -4882,6 +4892,13 @@ nsTextFrame::UnionAdditionalOverflow(nsPresContext* aPresContext,
}
for (uint32_t i = 0; i < textDecs.mOverlines.Length(); ++i) {
const LineDecoration& dec = textDecs.mOverlines[i];
uint8_t decorationStyle = dec.mStyle;
// If the style is solid, let's include decoration line rect of solid
// style since changing the style from none to solid/dotted/dashed
// doesn't cause reflow.
if (decorationStyle == NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
decorationStyle = NS_STYLE_TEXT_DECORATION_STYLE_SOLID;
}
float inflation = nsLayoutUtils::FontSizeInflationInner(dec.mFrame,
inflationMinFontSize);
@ -4892,7 +4909,7 @@ nsTextFrame::UnionAdditionalOverflow(nsPresContext* aPresContext,
nsCSSRendering::GetTextDecorationRect(aPresContext,
gfxSize(gfxWidth, metrics.underlineSize),
ascent, metrics.maxAscent,
NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, dec.mStyle) +
NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, decorationStyle) +
nsPoint(0, -dec.mBaselineOffset);
top = NS_MIN(decorationRect.y, top);
@ -4900,6 +4917,13 @@ nsTextFrame::UnionAdditionalOverflow(nsPresContext* aPresContext,
}
for (uint32_t i = 0; i < textDecs.mStrikes.Length(); ++i) {
const LineDecoration& dec = textDecs.mStrikes[i];
uint8_t decorationStyle = dec.mStyle;
// If the style is solid, let's include decoration line rect of solid
// style since changing the style from none to solid/dotted/dashed
// doesn't cause reflow.
if (decorationStyle == NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
decorationStyle = NS_STYLE_TEXT_DECORATION_STYLE_SOLID;
}
float inflation = nsLayoutUtils::FontSizeInflationInner(dec.mFrame,
inflationMinFontSize);
@ -4910,7 +4934,7 @@ nsTextFrame::UnionAdditionalOverflow(nsPresContext* aPresContext,
nsCSSRendering::GetTextDecorationRect(aPresContext,
gfxSize(gfxWidth, metrics.strikeoutSize),
ascent, metrics.strikeoutOffset,
NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH, dec.mStyle) +
NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH, decorationStyle) +
nsPoint(0, -dec.mBaselineOffset);
top = NS_MIN(decorationRect.y, top);
bottom = NS_MAX(decorationRect.YMost(), bottom);
@ -5982,6 +6006,9 @@ nsTextFrame::DrawTextRunAndDecorations(
// Underlines
for (uint32_t i = aDecorations.mUnderlines.Length(); i-- > 0; ) {
const LineDecoration& dec = aDecorations.mUnderlines[i];
if (dec.mStyle == NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
continue;
}
float inflation = nsLayoutUtils::FontSizeInflationInner(dec.mFrame,
inflationMinFontSize);
@ -5999,6 +6026,9 @@ nsTextFrame::DrawTextRunAndDecorations(
// Overlines
for (uint32_t i = aDecorations.mOverlines.Length(); i-- > 0; ) {
const LineDecoration& dec = aDecorations.mOverlines[i];
if (dec.mStyle == NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
continue;
}
float inflation = nsLayoutUtils::FontSizeInflationInner(dec.mFrame,
inflationMinFontSize);
@ -6022,6 +6052,9 @@ nsTextFrame::DrawTextRunAndDecorations(
// Line-throughs
for (uint32_t i = aDecorations.mStrikes.Length(); i-- > 0; ) {
const LineDecoration& dec = aDecorations.mStrikes[i];
if (dec.mStyle == NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
continue;
}
float inflation = nsLayoutUtils::FontSizeInflationInner(dec.mFrame,
inflationMinFontSize);