diff options
| -rw-r--r-- | include/private/SkMutex.h | 2 | ||||
| -rw-r--r-- | src/ports/SkScalerContext_win_dw.cpp | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/include/private/SkMutex.h b/include/private/SkMutex.h index da44f648d0..8c78e1205c 100644 --- a/include/private/SkMutex.h +++ b/include/private/SkMutex.h @@ -119,7 +119,7 @@ private: typedef SkAutoTAcquire<SkBaseMutex> SkAutoMutexAcquire; #define SkAutoMutexAcquire(...) SK_REQUIRE_LOCAL_VAR(SkAutoMutexAcquire) -typedef SkAutoTExclusive<SkMutex> SkAutoMutexExclusive; +typedef SkAutoTExclusive<SkBaseMutex> SkAutoMutexExclusive; #define SkAutoMutexExclusive(...) SK_REQUIRE_LOCAL_VAR(SkAutoMutexExclusive) #endif//SkMutex_DEFINED diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp index eec65663e7..347bc824b7 100644 --- a/src/ports/SkScalerContext_win_dw.cpp +++ b/src/ports/SkScalerContext_win_dw.cpp @@ -37,17 +37,7 @@ */ SK_DECLARE_STATIC_MUTEX(DWriteFactoryMutex); -class Exclusive { -public: - Exclusive(SkBaseMutex& mutex) : fMutex(mutex) { - fMutex.acquire(); - } - ~Exclusive() { - fMutex.release(); - } -private: - SkBaseMutex& fMutex; -}; +typedef SkAutoMutexExclusive Exclusive; static bool isLCD(const SkScalerContext::Rec& rec) { return SkMask::kLCD16_Format == rec.fMaskFormat; |