Add thread safety annotations for SkMutex
Introduce SkAutoMutexExclusive for SkMutex RAII.
Unsubclass SkMutex from SkBaseMutex to allow annotations
for class field mutexes separate from global mutexes.
Leave SkAutoMutexAcquire for handling global mutexes using
SkBaseMutex.
Test using GrSingleOwner.h.
Change-Id: I19d9d0ae0d05206cbb6ef137dc362969048c9c07
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/213136
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index c0d0d3c..014efa4 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1576,7 +1576,7 @@
// can be very slow. If we do need to compute a new glyphID, then
// access those freetype objects and continue the loop.
- SkAutoMutexAcquire ama(fC2GCacheMutex);
+ SkAutoMutexExclusive ama(fC2GCacheMutex);
int i;
for (i = 0; i < count; ++i) {
@@ -1824,7 +1824,7 @@
}
bool SkTypeface_FreeType::Scanner::recognizedFont(SkStreamAsset* stream, int* numFaces) const {
- SkAutoMutexAcquire libraryLock(fLibraryMutex);
+ SkAutoMutexExclusive libraryLock(fLibraryMutex);
FT_StreamRec streamRec;
FT_Face face = this->openFace(stream, -1, &streamRec);
@@ -1843,7 +1843,7 @@
SkStreamAsset* stream, int ttcIndex,
SkString* name, SkFontStyle* style, bool* isFixedPitch, AxisDefinitions* axes) const
{
- SkAutoMutexAcquire libraryLock(fLibraryMutex);
+ SkAutoMutexExclusive libraryLock(fLibraryMutex);
FT_StreamRec streamRec;
FT_Face face = this->openFace(stream, ttcIndex, &streamRec);