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 1128190 - Always use a mask to render shadows for color glyphs, regardless of blur radius. r=roc

Browse Source
This commit is contained in:
Jonathan Kew 2015-02-02 09:19:28 +00:00
parent 96730d6ab4
commit 01795be486
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/thebes/gfxFont.h
View File

@ -1406,6 +1406,16 @@ public:
return mFontEntry->HasGraphiteTables();
}
// Whether this is a font that may be doing full-color rendering,
// and therefore needs us to use a mask for text-shadow even when
// we're not actually blurring.
bool AlwaysNeedsMaskForShadow() {
return mFontEntry->TryGetColorGlyphs() ||
mFontEntry->TryGetSVGData(this) ||
mFontEntry->HasFontTable(TRUETYPE_TAG('C','B','D','T')) ||
mFontEntry->HasFontTable(TRUETYPE_TAG('s','b','i','x'));
}
// whether a feature is supported by the font (limited to a small set
// of features for which some form of fallback needs to be implemented)
bool SupportsFeature(int32_t aScript, uint32_t aFeatureTag);

23
layout/generic/nsTextFrame.cpp
View File

@ -5543,7 +5543,8 @@ nsTextFrame::PaintOneShadow(uint32_t aOffset, uint32_t aLength,
const gfxPoint& aFramePt, const gfxPoint& aTextBaselinePt,
gfxContext* aCtx, const nscolor& aForegroundColor,
const nsCharClipDisplayItem::ClipEdges& aClipEdges,
nscoord aLeftSideOffset, gfxRect& aBoundingBox)
nscoord aLeftSideOffset, gfxRect& aBoundingBox,
uint32_t aBlurFlags)
{
PROFILER_LABEL("nsTextFrame", "PaintOneShadow",
js::ProfileEntry::Category::GRAPHICS);
@ -5564,7 +5565,8 @@ nsTextFrame::PaintOneShadow(uint32_t aOffset, uint32_t aLength,
nsContextBoxBlur contextBoxBlur;
gfxContext* shadowContext = contextBoxBlur.Init(shadowRect, 0, blurRadius,
PresContext()->AppUnitsPerDevPixel(),
aCtx, aDirtyRect, nullptr);
aCtx, aDirtyRect, nullptr,
aBlurFlags);
if (!shadowContext)
return;
@ -6076,13 +6078,28 @@ nsTextFrame::PaintShadows(nsCSSShadowArray* aShadow,
shadowMetrics.mAdvanceWidth, shadowMetrics.mAscent + shadowMetrics.mDescent);
shadowMetrics.mBoundingBox.UnionRect(shadowMetrics.mBoundingBox,
decorationRect);
// If the textrun uses any color or SVG fonts, we need to force use of a mask
// for shadow rendering even if blur radius is zero.
uint32_t blurFlags = 0;
uint32_t numGlyphRuns;
const gfxTextRun::GlyphRun* run = mTextRun->GetGlyphRuns(&numGlyphRuns);
while (numGlyphRuns-- > 0) {
if (run->mFont->AlwaysNeedsMaskForShadow()) {
blurFlags = nsContextBoxBlur::FORCE_MASK;
break;
}
run++;
}
for (uint32_t i = aShadow->Length(); i > 0; --i) {
PaintOneShadow(aOffset, aLength,
aShadow->ShadowAt(i - 1), &aProvider,
aDirtyRect, aFramePt, aTextBaselinePt, aCtx,
aForegroundColor, aClipEdges,
aLeftEdgeOffset,
shadowMetrics.mBoundingBox);
shadowMetrics.mBoundingBox,
blurFlags);
}
}

3
layout/generic/nsTextFrame.h
View File

@ -582,7 +582,8 @@ protected:
const nscolor& aForegroundColor,
const nsCharClipDisplayItem::ClipEdges& aClipEdges,
nscoord aLeftSideOffset,
gfxRect& aBoundingBox);
gfxRect& aBoundingBox,
uint32_t aBlurFlags);
void PaintShadows(nsCSSShadowArray* aShadow,
uint32_t aOffset, uint32_t aLength,