1 files changed, 12 insertions, 17 deletions

diff --git a/src/core/SkMaskCache.cpp b/src/core/SkMaskCache.cpp
index f998a928cc..c4b964418f 100644
--- a/src/core/SkMaskCache.cpp
+++ b/src/core/SkMaskCache.cpp
@@ -20,19 +20,17 @@ static unsigned gRRectBlurKeyNamespaceLabel;
 
 struct RRectBlurKey : public SkResourceCache::Key {
 public:
-    RRectBlurKey(SkScalar sigma, const SkRRect& rrect, SkBlurStyle style, SkBlurQuality quality)
+    RRectBlurKey(SkScalar sigma, const SkRRect& rrect, SkBlurStyle style)
         : fSigma(sigma)
         , fStyle(style)
-        , fQuality(quality)
         , fRRect(rrect)
     {
         this->init(&gRRectBlurKeyNamespaceLabel, 0,
-                   sizeof(fSigma) + sizeof(fStyle) + sizeof(fQuality) + sizeof(fRRect));
+                   sizeof(fSigma) + sizeof(fStyle) + sizeof(fRRect));
     }
 
     SkScalar   fSigma;
     int32_t    fStyle;
-    int32_t    fQuality;
     SkRRect    fRRect;
 };
 
@@ -74,10 +72,10 @@ struct RRectBlurRec : public SkResourceCache::Rec {
 };
 } // namespace
 
-SkCachedData* SkMaskCache::FindAndRef(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+SkCachedData* SkMaskCache::FindAndRef(SkScalar sigma, SkBlurStyle style,
                                   const SkRRect& rrect, SkMask* mask, SkResourceCache* localCache) {
     MaskValue result;
-    RRectBlurKey key(sigma, rrect, style, quality);
+    RRectBlurKey key(sigma, rrect, style);
     if (!CHECK_LOCAL(localCache, find, Find, key, RRectBlurRec::Visitor, &result)) {
         return nullptr;
     }
@@ -87,10 +85,10 @@ SkCachedData* SkMaskCache::FindAndRef(SkScalar sigma, SkBlurStyle style, SkBlurQ
     return result.fData;
 }
 
-void SkMaskCache::Add(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+void SkMaskCache::Add(SkScalar sigma, SkBlurStyle style,
                       const SkRRect& rrect, const SkMask& mask, SkCachedData* data,
                       SkResourceCache* localCache) {
-    RRectBlurKey key(sigma, rrect, style, quality);
+    RRectBlurKey key(sigma, rrect, style);
     return CHECK_LOCAL(localCache, add, Add, new RRectBlurRec(key, mask, data));
 }
 
@@ -101,11 +99,9 @@ static unsigned gRectsBlurKeyNamespaceLabel;
 
 struct RectsBlurKey : public SkResourceCache::Key {
 public:
-    RectsBlurKey(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
-                 const SkRect rects[], int count)
+    RectsBlurKey(SkScalar sigma, SkBlurStyle style, const SkRect rects[], int count)
         : fSigma(sigma)
         , fStyle(style)
-        , fQuality(quality)
     {
         SkASSERT(1 == count || 2 == count);
         SkIRect ir;
@@ -121,12 +117,11 @@ public:
         fSizes[3] = SkSize{rects[0].x() - ir.x(), rects[0].y() - ir.y()};
 
         this->init(&gRectsBlurKeyNamespaceLabel, 0,
-                   sizeof(fSigma) + sizeof(fStyle) + sizeof(fQuality) + sizeof(fSizes));
+                   sizeof(fSigma) + sizeof(fStyle) + sizeof(fSizes));
     }
 
     SkScalar    fSigma;
     int32_t     fStyle;
-    int32_t     fQuality;
     SkSize      fSizes[4];
 };
 
@@ -168,11 +163,11 @@ struct RectsBlurRec : public SkResourceCache::Rec {
 };
 } // namespace
 
-SkCachedData* SkMaskCache::FindAndRef(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+SkCachedData* SkMaskCache::FindAndRef(SkScalar sigma, SkBlurStyle style,
                                       const SkRect rects[], int count, SkMask* mask,
                                       SkResourceCache* localCache) {
     MaskValue result;
-    RectsBlurKey key(sigma, style, quality, rects, count);
+    RectsBlurKey key(sigma, style, rects, count);
     if (!CHECK_LOCAL(localCache, find, Find, key, RectsBlurRec::Visitor, &result)) {
         return nullptr;
     }
@@ -182,9 +177,9 @@ SkCachedData* SkMaskCache::FindAndRef(SkScalar sigma, SkBlurStyle style, SkBlurQ
     return result.fData;
 }
 
-void SkMaskCache::Add(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+void SkMaskCache::Add(SkScalar sigma, SkBlurStyle style,
                       const SkRect rects[], int count, const SkMask& mask, SkCachedData* data,
                       SkResourceCache* localCache) {
-    RectsBlurKey key(sigma, style, quality, rects, count);
+    RectsBlurKey key(sigma, style, rects, count);
     return CHECK_LOCAL(localCache, add, Add, new RectsBlurRec(key, mask, data));
 }