AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove global static mutex in SkScalerContext_win_dw.cpp

Browse Source 
In SkScalerContext_win_dw.cpp there is a global static initializer created at
load time: static SkSharedMutex DWriteFactoryMutex. Change is to move this to
a function where it will be created as a local static on demand.

Bug: skia:10018
Change-Id: Iac5b2ca69617f485c3dce54f18d9a6d7f0416b82
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275838
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Chris Davis 2020-03-08 13:23:17 -07:00 committed by Skia Commit-Bot
parent b18390699e
commit 475b9d0fb7
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ports/SkScalerContext_win_dw.cpp
View File

@ -41,9 +41,13 @@
/* Note:
* In versions 8 and 8.1 of Windows, some calls in DWrite are not thread safe.
* The DWriteFactoryMutex protects the calls that are problematic.
* The mutex returned from get_dwrite_factory_mutex() protects the calls that are
* problematic.
*/
static SkSharedMutex DWriteFactoryMutex;
static SkSharedMutex& get_dwrite_factory_mutex() {
static SkSharedMutex mutex;
return mutex;
}
typedef SkAutoSharedMutexExclusive Exclusive;
typedef SkAutoSharedMutexShared Shared;
@ -53,7 +57,7 @@ static bool isLCD(const SkScalerContextRec& rec) {
}
static bool is_hinted(DWriteFontTypeface* typeface) {
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
AutoTDWriteTable<SkOTTableMaximumProfile> maxp(typeface->fDWriteFontFace.get());
if (!maxp.fExists) {
return false;
@ -124,7 +128,7 @@ static bool is_gridfit_only(GaspRange::Behavior flags) {
}
static bool has_bitmap_strike(DWriteFontTypeface* typeface, GaspRange range) {
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
{
AutoTDWriteTable<SkOTTableEmbeddedBitmapLocation> eblc(typeface->fDWriteFontFace.get());
if (!eblc.fExists) {
@ -385,7 +389,7 @@ bool SkScalerContext_DW::generateAdvance(SkGlyph* glyph) {
if (DWRITE_MEASURING_MODE_GDI_CLASSIC == fMeasuringMode ||
DWRITE_MEASURING_MODE_GDI_NATURAL == fMeasuringMode)
{
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
HRBM(this->getDWriteTypeface()->fDWriteFontFace->GetGdiCompatibleGlyphMetrics(
fTextSizeMeasure,
1.0f, // pixelsPerDip
@ -397,14 +401,14 @@ bool SkScalerContext_DW::generateAdvance(SkGlyph* glyph) {
&gm),
"Could not get gdi compatible glyph metrics.");
} else {
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
HRBM(this->getDWriteTypeface()->fDWriteFontFace->GetDesignGlyphMetrics(&glyphId, 1, &gm),
"Could not get design metrics.");
}
DWRITE_FONT_METRICS dwfm;
{
Shared l(DWriteFactoryMutex);
Shared l(get_dwrite_factory_mutex());
this->getDWriteTypeface()->fDWriteFontFace->GetMetrics(&dwfm);
}
SkScalar advanceX = fTextSizeMeasure * gm.advanceWidth / dwfm.designUnitsPerEm;
@ -453,7 +457,7 @@ HRESULT SkScalerContext_DW::getBoundingBox(SkGlyph* glyph,
SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
{
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
// IDWriteFactory2::CreateGlyphRunAnalysis is very bad at aliased glyphs.
if (this->getDWriteTypeface()->fFactory2 &&
(fGridFitMode == DWRITE_GRID_FIT_MODE_DISABLED ||
@ -483,7 +487,7 @@ HRESULT SkScalerContext_DW::getBoundingBox(SkGlyph* glyph,
}
}
{
Shared l(DWriteFactoryMutex);
Shared l(get_dwrite_factory_mutex());
HRM(glyphRunAnalysis->GetAlphaTextureBounds(textureType, bbox),
"Could not get texture bounds.");
}
@ -552,7 +556,7 @@ void SkScalerContext_DW::generateColorMetrics(SkGlyph* glyph) {
HRVM(SkDWriteGeometrySink::Create(&path, &geometryToPath),
"Could not create geometry to path converter.");
{
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
HRVM(colorGlyph->glyphRun.fontFace->GetGlyphRunOutline(
colorGlyph->glyphRun.fontEmSize,
colorGlyph->glyphRun.glyphIndices,
@ -933,7 +937,7 @@ const void* SkScalerContext_DW::drawDWMask(const SkGlyph& glyph,
{
SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
{
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
// IDWriteFactory2::CreateGlyphRunAnalysis is very bad at aliased glyphs.
if (this->getDWriteTypeface()->fFactory2 &&
(fGridFitMode == DWRITE_GRID_FIT_MODE_DISABLED ||
@ -969,7 +973,7 @@ const void* SkScalerContext_DW::drawDWMask(const SkGlyph& glyph,
bbox.right = glyph.left() + glyph.width();
bbox.bottom = glyph.top() + glyph.height();
{
Shared l(DWriteFactoryMutex);
Shared l(get_dwrite_factory_mutex());
HRNM(glyphRunAnalysis->CreateAlphaTexture(textureType,
&bbox,
fBits.begin(),
@ -1033,7 +1037,7 @@ void SkScalerContext_DW::generateColorGlyphImage(const SkGlyph& glyph) {
HRVM(SkDWriteGeometrySink::Create(&path, &geometryToPath),
"Could not create geometry to path converter.");
{
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
HRVM(colorGlyph->glyphRun.fontFace->GetGlyphRunOutline(
colorGlyph->glyphRun.fontEmSize,
colorGlyph->glyphRun.glyphIndices,
@ -1168,7 +1172,7 @@ bool SkScalerContext_DW::generatePath(SkGlyphID glyph, SkPath* path) {
"Could not create geometry to path converter.");
UINT16 glyphId = SkTo<UINT16>(glyph);
{
Exclusive l(DWriteFactoryMutex);
Exclusive l(get_dwrite_factory_mutex());
//TODO: convert to<->from DIUs? This would make a difference if hinting.
//It may not be needed, it appears that DirectWrite only hints at em size.
HRBM(this->getDWriteTypeface()->fDWriteFontFace->GetGlyphRunOutline(