Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1274936 - When <canvas> fillText is using a simple color, draw via the gfxTextRun::Draw code path to get support for COLR and SVG-in-OT fonts. r=bas

Browse Source
This commit is contained in:
Jonathan Kew 2016-05-25 09:21:10 +01:00
parent 38d984d342
commit ec45c18193
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dom/canvas/CanvasRenderingContext2D.cpp
View File

@ -3582,6 +3582,22 @@ struct MOZ_STACK_CLASS CanvasBidiProcessor : public nsBidiPresUtils::BidiProcess
// throughout the text layout process
}
mCtx->EnsureTarget();
// If the operation is 'fill' with a simple color, we defer to gfxTextRun
// which will handle color/svg-in-ot fonts appropriately. Such fonts will
// not render well via the code below.
if (mOp == CanvasRenderingContext2D::TextDrawOperation::FILL &&
mState->StyleIsColor(CanvasRenderingContext2D::Style::FILL)) {
RefPtr<gfxContext> thebes =
gfxContext::ForDrawTargetWithTransform(mCtx->mTarget);
nscolor fill = mState->colorStyles[CanvasRenderingContext2D::Style::FILL];
thebes->SetColor(Color::FromABGR(fill));
gfxTextRun::DrawParams params(thebes);
mTextRun->Draw(gfxTextRun::Range(mTextRun.get()), point, params);
return;
}
uint32_t numRuns;
const gfxTextRun::GlyphRun *runs = mTextRun->GetGlyphRuns(&numRuns);
const int32_t appUnitsPerDevUnit = mAppUnitsPerDevPixel;
@ -3591,7 +3607,6 @@ struct MOZ_STACK_CLASS CanvasBidiProcessor : public nsBidiPresUtils::BidiProcess
float advanceSum = 0;
mCtx->EnsureTarget();
for (uint32_t c = 0; c < numRuns; c++) {
gfxFont *font = runs[c].mFont;