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

Bug 1258636 part 2 - Use struct to pass params for nsTextFrame::PaintDecorationLine. r=jfkthame

Browse Source 
MozReview-Commit-ID: CICgNSPRrLM
This commit is contained in:
Xidorn Quan
2016-03-22 17:42:18 +08:00
parent 5c533c7216
commit 3f99895d64
2 changed files with 91 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
layout/generic/nsTextFrame.cpp
View File

@@ -5466,44 +5466,42 @@ nsTextFrame::ComputeSelectionUnderlineHeight(
}
}
enum class DecorationType
{
Normal, Selection
};
struct nsTextFrame::PaintDecorationLineParams
: nsCSSRendering::DecorationRectParams
{
gfxContext* context = nullptr;
LayoutDeviceRect dirtyRect;
Point pt;
const nscolor* overrideColor = nullptr;
nscolor color = NS_RGBA(0, 0, 0, 0);
gfxFloat icoordInFrame = 0.0f;
DecorationType decorationType = DecorationType::Normal;
DrawPathCallbacks* callbacks = nullptr;
};
void
nsTextFrame::PaintDecorationLine(gfxContext* const aCtx,
const LayoutDeviceRect& aDirtyRect,
nscolor aColor,
const nscolor* aOverrideColor,
const Point& aPt,
gfxFloat aICoordInFrame,
const Size& aLineSize,
gfxFloat aAscent,
gfxFloat aOffset,
uint8_t aDecoration,
uint8_t aStyle,
DecorationType aDecorationType,
DrawPathCallbacks* aCallbacks,
bool aVertical,
gfxFloat aDescentLimit /* = -1.0 */)
nsTextFrame::PaintDecorationLine(const PaintDecorationLineParams& aParams)
{
nsCSSRendering::PaintDecorationLineParams params;
params.dirtyRect = aDirtyRect.ToUnknownRect();
params.pt = aPt;
params.color = aOverrideColor ? *aOverrideColor : aColor;
params.icoordInFrame = Float(aICoordInFrame);
params.lineSize = aLineSize;
params.ascent = aAscent;
params.offset = aOffset;
params.decoration = aDecoration;
params.style = aStyle;
params.vertical = aVertical;
params.descentLimit = aDescentLimit;
if (aCallbacks) {
static_cast<nsCSSRendering::DecorationRectParams&>(params) = aParams;
params.dirtyRect = aParams.dirtyRect.ToUnknownRect();
params.pt = aParams.pt;
params.color = aParams.overrideColor ? *aParams.overrideColor : aParams.color;
params.icoordInFrame = Float(aParams.icoordInFrame);
if (aParams.callbacks) {
Rect path = nsCSSRendering::DecorationLineToPath(params);
if (aDecorationType == eNormalDecoration) {
aCallbacks->PaintDecorationLine(path, params.color);
if (aParams.decorationType == DecorationType::Normal) {
aParams.callbacks->PaintDecorationLine(path, params.color);
} else {
aCallbacks->PaintSelectionDecorationLine(path, params.color);
aParams.callbacks->PaintSelectionDecorationLine(path, params.color);
}
} else {
nsCSSRendering::PaintDecorationLine(this, *aCtx->GetDrawTarget(), params);
nsCSSRendering::PaintDecorationLine(
this, *aParams.context->GetDrawTarget(), params);
}
}
@@ -5527,25 +5525,32 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
gfxFloat aDecorationOffsetDir,
uint8_t aDecoration)
{
Point pt(aPt);
Size size(aWidth,
ComputeSelectionUnderlineHeight(aTextPaintStyle.PresContext(),
aFontMetrics, aType));
gfxFloat descentLimit =
PaintDecorationLineParams params;
params.context = aContext;
params.dirtyRect = aDirtyRect;
params.pt = aPt;
params.lineSize = Size(
aWidth, ComputeSelectionUnderlineHeight(aTextPaintStyle.PresContext(),
aFontMetrics, aType));
params.ascent = aAscent;
gfxFloat offset = aDecoration == NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE ?
aFontMetrics.underlineOffset : aFontMetrics.maxAscent;
params.offset = offset * aDecorationOffsetDir;
params.decoration = aDecoration;
params.decorationType = DecorationType::Selection;
params.callbacks = aCallbacks;
params.vertical = aVertical;
params.descentLimit =
ComputeDescentLimitForSelectionUnderline(aTextPaintStyle.PresContext(),
aFontMetrics);
float relativeSize;
uint8_t style;
nscolor color;
int32_t index =
nsTextPaintStyle::GetUnderlineStyleIndexForSelectionType(aType);
bool weDefineSelectionUnderline =
aTextPaintStyle.GetSelectionUnderlineForPaint(index, &color,
&relativeSize, &style);
aTextPaintStyle.GetSelectionUnderlineForPaint(index, &params.color,
&relativeSize, &params.style);
gfxFloat offset = aDecoration == NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE ?
aFontMetrics.underlineOffset : aFontMetrics.maxAscent;
switch (aType) {
case nsISelectionController::SELECTION_IME_RAWINPUT:
@@ -5565,15 +5570,15 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
// +---------------------+----------------------+--------------------
// ^ ^ ^ ^ ^
// gap gap gap
pt.x += 1.0;
size.width -= 2.0;
params.pt.x += 1.0;
params.lineSize.width -= 2.0;
if (aRangeStyle.IsDefined()) {
// If IME defines the style, that should override our definition.
if (aRangeStyle.IsLineStyleDefined()) {
if (aRangeStyle.mLineStyle == TextRangeStyle::LINESTYLE_NONE) {
return;
}
style = aRangeStyle.mLineStyle;
params.style = aRangeStyle.mLineStyle;
relativeSize = aRangeStyle.mIsBoldLine ? 2.0f : 1.0f;
} else if (!weDefineSelectionUnderline) {
// There is no underline style definition.
@@ -5584,7 +5589,7 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
if (aRangeStyle.IsUnderlineColorDefined() &&
(!aRangeStyle.IsForegroundColorDefined() ||
aRangeStyle.mUnderlineColor != aRangeStyle.mForegroundColor)) {
color = aRangeStyle.mUnderlineColor;
params.color = aRangeStyle.mUnderlineColor;
}
// If foreground color or background color is defined, the both colors
// are computed by GetSelectionTextColors(). Then, we should use its
@@ -5594,11 +5599,11 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
aRangeStyle.IsBackgroundColorDefined()) {
nscolor bg;
GetSelectionTextColors(aType, aTextPaintStyle, aRangeStyle,
&color, &bg);
&params.color, &bg);
}
// Otherwise, use the foreground color of the frame.
else {
color = aTextPaintStyle.GetTextColor();
params.color = aTextPaintStyle.GetTextColor();
}
} else if (!weDefineSelectionUnderline) {
// IME doesn't specify the selection style and we don't define selection
@@ -5628,11 +5633,10 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
NS_WARNING("Requested selection decorations when there aren't any");
return;
}
size.height *= relativeSize;
PaintDecorationLine(aContext, aDirtyRect, color, nullptr, pt,
(aVertical ? (pt.y - aPt.y) : (pt.x - aPt.x)) + aICoordInFrame,
size, aAscent, offset * aDecorationOffsetDir, aDecoration, style,
eSelectionDecoration, aCallbacks, aVertical, descentLimit);
params.lineSize.height *= relativeSize;
params.icoordInFrame = (aVertical ? params.pt.y - aPt.y
: params.pt.x - aPt.x) + aICoordInFrame;
PaintDecorationLine(params);
}
/* static */
@@ -6646,14 +6650,8 @@ nsTextFrame::DrawTextRunAndDecorations(Range aRange,
aParams.clipEdges->Intersect(&x, &measure);
}
// decPt is the physical point where the decoration is to be drawn,
// relative to the frame; one of its coordinates will be updated below.
Point decPt(x / app, y / app);
Float& bCoord = verticalRun ? decPt.x : decPt.y;
// decSize is a textrun-relative size, so its 'width' field is actually
// the run-relative measure, and 'height' will be the line thickness
Size decSize(measure / app, 0);
gfxFloat ascent = gfxFloat(mAscent) / app;
// The starting edge of the frame in block direction
@@ -6674,6 +6672,19 @@ nsTextFrame::DrawTextRunAndDecorations(Range aRange,
// so we will multiply the values from metrics by this factor.
gfxFloat decorationOffsetDir = mTextRun->IsSidewaysLeft() ? -1.0 : 1.0;
PaintDecorationLineParams params;
params.context = aParams.context;
params.dirtyRect = aParams.dirtyRect;
params.overrideColor = aParams.decorationOverrideColor;
params.callbacks = aParams.callbacks;
// pt is the physical point where the decoration is to be drawn,
// relative to the frame; one of its coordinates will be updated below.
params.pt = Point(x / app, y / app);
Float& bCoord = verticalRun ? params.pt.x : params.pt.y;
params.lineSize = Size(measure / app, 0);
params.ascent = ascent;
params.vertical = verticalRun;
// Underlines
for (uint32_t i = aDecorations.mUnderlines.Length(); i-- > 0; ) {
const LineDecoration& dec = aDecorations.mUnderlines[i];
@@ -6687,14 +6698,14 @@ nsTextFrame::DrawTextRunAndDecorations(Range aRange,
GetFirstFontMetrics(GetFontGroupForFrame(dec.mFrame, inflation),
useVerticalMetrics);
decSize.height = metrics.underlineSize;
params.lineSize.height = metrics.underlineSize;
bCoord = (frameBStart - dec.mBaselineOffset) / app;
PaintDecorationLine(aParams.context, aParams.dirtyRect, dec.mColor,
aParams.decorationOverrideColor, decPt, 0.0, decSize, ascent,
decorationOffsetDir * metrics.underlineOffset,
NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
dec.mStyle, eNormalDecoration, aParams.callbacks, verticalRun);
params.color = dec.mColor;
params.offset = decorationOffsetDir * metrics.underlineOffset;
params.decoration = NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE;
params.style = dec.mStyle;
PaintDecorationLine(params);
}
// Overlines
for (uint32_t i = aDecorations.mOverlines.Length(); i-- > 0; ) {
@@ -6709,14 +6720,14 @@ nsTextFrame::DrawTextRunAndDecorations(Range aRange,
GetFirstFontMetrics(GetFontGroupForFrame(dec.mFrame, inflation),
useVerticalMetrics);
decSize.height = metrics.underlineSize;
params.lineSize.height = metrics.underlineSize;
bCoord = (frameBStart - dec.mBaselineOffset) / app;
PaintDecorationLine(aParams.context, aParams.dirtyRect, dec.mColor,
aParams.decorationOverrideColor, decPt, 0.0, decSize, ascent,
decorationOffsetDir * metrics.maxAscent,
NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, dec.mStyle,
eNormalDecoration, aParams.callbacks, verticalRun);
params.color = dec.mColor;
params.offset = decorationOffsetDir * metrics.maxAscent;
params.decoration = NS_STYLE_TEXT_DECORATION_LINE_OVERLINE;
params.style = dec.mStyle;
PaintDecorationLine(params);
}
// CSS 2.1 mandates that text be painted after over/underlines, and *then*
@@ -6740,14 +6751,14 @@ nsTextFrame::DrawTextRunAndDecorations(Range aRange,
GetFirstFontMetrics(GetFontGroupForFrame(dec.mFrame, inflation),
useVerticalMetrics);
decSize.height = metrics.strikeoutSize;
params.lineSize.height = metrics.strikeoutSize;
bCoord = (frameBStart - dec.mBaselineOffset) / app;
PaintDecorationLine(aParams.context, aParams.dirtyRect, dec.mColor,
aParams.decorationOverrideColor, decPt, 0.0, decSize, ascent,
decorationOffsetDir * metrics.strikeoutOffset,
NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH,
dec.mStyle, eNormalDecoration, aParams.callbacks, verticalRun);
params.color = dec.mColor;
params.offset = decorationOffsetDir * metrics.strikeoutOffset;
params.decoration = NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH;
params.style = dec.mStyle;
PaintDecorationLine(params);
}
}

23
layout/generic/nsTextFrame.h
View File

@@ -746,26 +746,9 @@ protected:
bool aVertical,
gfxFloat aDecorationOffsetDir,
uint8_t aDecoration);
enum DecorationType
{
eNormalDecoration,
eSelectionDecoration
};
void PaintDecorationLine(gfxContext* const aCtx,
const LayoutDeviceRect& aDirtyRect,
nscolor aColor,
const nscolor* aOverrideColor,
const Point& aPt,
gfxFloat aICoordInFrame,
const Size& aLineSize,
gfxFloat aAscent,
gfxFloat aOffset,
uint8_t aDecoration,
uint8_t aStyle,
DecorationType aDecorationType,
DrawPathCallbacks* aCallbacks,
bool aVertical,
gfxFloat aDescentLimit = -1.0);
struct PaintDecorationLineParams;
void PaintDecorationLine(const PaintDecorationLineParams& aParams);
/**
* ComputeDescentLimitForSelectionUnderline() computes the most far position
* where we can put selection underline.