SkPaint::FilterLevel -> SkFilterQuality

src/effects/SkPictureImageFilter.cpp

 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureImageFilter.h"
 #include "SkDevice.h"
 #include "SkCanvas.h"
 #include "SkReadBuffer.h"
 #include "SkSurfaceProps.h"
 #include "SkWriteBuffer.h"
 #include "SkValidationUtils.h"
 
 SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture, uint32_t uniqueID)
     : INHERITED(0, 0, NULL, uniqueID)
     , fPicture(SkSafeRef(picture))
     , fCropRect(picture ? picture->cullRect() : SkRect::MakeEmpty())
     , fPictureResolution(kDeviceSpace_PictureResolution) 
-    , fFilterLevel(SkPaint::kLow_FilterLevel) {
+    , fFilterQuality(kLow_SkFilterQuality) {
 }
 
 SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect,
                                            uint32_t uniqueID, PictureResolution pictureResolution,
-                                           SkPaint::FilterLevel filterLevel)
+                                           SkFilterQuality filterQuality)
     : INHERITED(0, 0, NULL, uniqueID)
     , fPicture(SkSafeRef(picture))
     , fCropRect(cropRect)
     , fPictureResolution(pictureResolution)
-    , fFilterLevel(filterLevel) {
+    , fFilterQuality(filterQuality) {
 }
 
 SkPictureImageFilter::~SkPictureImageFilter() {
     SkSafeUnref(fPicture);
 }
 
 SkFlattenable* SkPictureImageFilter::CreateProc(SkReadBuffer& buffer) {
     SkAutoTUnref<SkPicture> picture;
     SkRect cropRect;
 
@@ skipping 10 matching lines @@
     buffer.readRect(&cropRect);
     PictureResolution pictureResolution;
     if (buffer.isVersionLT(SkReadBuffer::kPictureImageFilterResolution_Version)) {
         pictureResolution = kDeviceSpace_PictureResolution;
     } else {
         pictureResolution = (PictureResolution)buffer.readInt();
     }  
 
     if (kLocalSpace_PictureResolution == pictureResolution) {
         //filterLevel is only serialized if pictureResolution is LocalSpace
-        SkPaint::FilterLevel filterLevel;
+        SkFilterQuality filterQuality;
         if (buffer.isVersionLT(SkReadBuffer::kPictureImageFilterLevel_Version)) {
-            filterLevel = SkPaint::kLow_FilterLevel;
+            filterQuality = kLow_SkFilterQuality;
         } else {
-            filterLevel = (SkPaint::FilterLevel)buffer.readInt();
+            filterQuality = (SkFilterQuality)buffer.readInt();
         }
-        return CreateForLocalSpace(picture, cropRect, filterLevel);    
+        return CreateForLocalSpace(picture, cropRect, filterQuality);
     }
     return Create(picture, cropRect);
 }
 
 void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
 #ifdef SK_DISALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS
     if (buffer.isCrossProcess()) {
         buffer.writeBool(false);
     } else 
 #endif
     {
         bool hasPicture = (fPicture != NULL);
         buffer.writeBool(hasPicture);
         if (hasPicture) {
             fPicture->flatten(buffer);
         }
     }
     buffer.writeRect(fCropRect);
     buffer.writeInt(fPictureResolution);
     if (kLocalSpace_PictureResolution == fPictureResolution) {
-        buffer.writeInt(fFilterLevel);
+        buffer.writeInt(fFilterQuality);
     }
 }
 
 bool SkPictureImageFilter::onFilterImage(Proxy* proxy, const SkBitmap&, const Context& ctx,
                                          SkBitmap* result, SkIPoint* offset) const {
     if (!fPicture) {
         offset->fX = offset->fY = 0;
         return true;
     }
 
@@ skipping 61 matching lines @@
     localCanvas.drawPicture(fPicture);
 
     // Pass explicit surface props, as the simplified canvas constructor discards device properties.
     // FIXME: switch back to the public constructor (and unfriend) after
     //        https://code.google.com/p/skia/issues/detail?id=3142 is fixed.
     SkCanvas canvas(device, proxy->surfaceProps(), SkCanvas::kDefault_InitFlags);
 
     canvas.translate(-SkIntToScalar(deviceBounds.fLeft), -SkIntToScalar(deviceBounds.fTop));
     canvas.concat(ctx.ctm());
     SkPaint paint;
-    paint.setFilterLevel(fFilterLevel);
+    paint.setFilterQuality(fFilterQuality);
     canvas.drawBitmap(localDevice.get()->accessBitmap(false), SkIntToScalar(localIBounds.fLeft),
                       SkIntToScalar(localIBounds.fTop), &paint);
     //canvas.drawPicture(fPicture);
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkPictureImageFilter::toString(SkString* str) const {
     str->appendf("SkPictureImageFilter: (");
     str->appendf("crop: (%f,%f,%f,%f) ", 
                  fCropRect.fLeft, fCropRect.fTop, fCropRect.fRight, fCropRect.fBottom);
     if (fPicture) {
         str->appendf("picture: (%f,%f,%f,%f)",
                      fPicture->cullRect().fLeft, fPicture->cullRect().fTop,
                      fPicture->cullRect().fRight, fPicture->cullRect().fBottom);
     }
     str->append(")");
 }
 #endif