diff options
| -rw-r--r-- | tools/skpdiff/SkDiffContext.cpp | 2 | ||||
| -rw-r--r-- | tools/skpdiff/SkDiffContext.h | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tools/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp index c4a125864a..2bd1694a08 100644 --- a/tools/skpdiff/SkDiffContext.cpp +++ b/tools/skpdiff/SkDiffContext.cpp @@ -69,7 +69,6 @@ void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) { // Load the images at the paths SkBitmap baselineBitmap; SkBitmap testBitmap; - SkAutoMutexAcquire imageLock(fImageMutex); if (!SkImageDecoder::DecodeFile(baselinePath, &baselineBitmap)) { SkDebugf("Failed to load bitmap \"%s\"\n", baselinePath); return; @@ -78,7 +77,6 @@ void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) { SkDebugf("Failed to load bitmap \"%s\"\n", testPath); return; } - imageLock.release(); // Setup a record for this diff fRecordMutex.acquire(); diff --git a/tools/skpdiff/SkDiffContext.h b/tools/skpdiff/SkDiffContext.h index 2d971059c2..c036c2ef6c 100644 --- a/tools/skpdiff/SkDiffContext.h +++ b/tools/skpdiff/SkDiffContext.h @@ -124,12 +124,6 @@ private: SkTArray<DiffData> fDiffs; }; - // This is needed to work around a bug in the multithreaded case where the - // image decoders are crashing when large numbers of threads are invoking - // the decoder at the same time. - // see https://code.google.com/p/skia/issues/detail?id=1803 - SkMutex fImageMutex; - // Used to protect access to fRecords and ensure only one thread is // adding new entries at a time. SkMutex fRecordMutex; |