From 8aacf2085673f6302a43d590d4d2890789b87192 Mon Sep 17 00:00:00 2001 From: mtklein Date: Thu, 18 Dec 2014 13:29:54 -0800 Subject: Fill SkRRect::fType proactively. I found no external mentions of SkRRect::kUnknown_Type. Motivating race found by TSAN: http://build.chromium.org/p/client.skia/builders/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN-Trybot/builds/48/steps/dm/logs/stdio BUG=skia: Review URL: https://codereview.chromium.org/801693003 --- src/effects/SkBlurMaskFilter.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/effects/SkBlurMaskFilter.cpp') diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index b849c74805..b4c020f5e7 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -324,10 +324,6 @@ SkBlurMaskFilterImpl::filterRRectToNine(const SkRRect& rrect, const SkMatrix& ma NinePatch* patch) const { SkASSERT(patch != NULL); switch (rrect.getType()) { - case SkRRect::kUnknown_Type: - // Unknown should never be returned. - SkASSERT(false); - // Fall through. case SkRRect::kEmpty_Type: // Nothing to draw. return kFalse_FilterReturn; -- cgit v1.2.3