remove legacy filter-flags, and store FilterLevel directly

tests/PaintTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkLayerDrawLooper.h"
@@ skipping 210 matching lines @@
     SkScalar miter = SkMaxScalar(SK_Scalar1, paint.getStrokeMiter());
     SkScalar inset = paint.getStrokeJoin() == SkPaint::kMiter_Join ?
                             SkScalarMul(paint.getStrokeWidth(), miter) :
                             paint.getStrokeWidth();
     maxR.inset(-inset, -inset);
 
     // test that our stroke didn't explode
     REPORTER_ASSERT(reporter, maxR.contains(strokeR));
 }
 
+static void test_filter_flags(skiatest::Reporter* reporter) {
+    const SkPaint::FilterLevel levels[] = {
+        SkPaint::kNone_FilterLevel,
+        SkPaint::kLow_FilterLevel,
+        SkPaint::kMedium_FilterLevel,
+        SkPaint::kHigh_FilterLevel,
+    };
+
+    const SkPaint::Hinting hinting[] = {
+        SkPaint::kNo_Hinting,
+        SkPaint::kSlight_Hinting,
+        SkPaint::kNormal_Hinting,
+        SkPaint::kFull_Hinting,
+    };
+
+    for (size_t i = 0; i < SK_ARRAY_COUNT(levels); ++i) {
+        for (size_t j = 0; j < SK_ARRAY_COUNT(hinting); ++j) {
+            SkPaint paint;
+            paint.setFilterLevel(levels[i]);
+            paint.setHinting(hinting[j]);
+            REPORTER_ASSERT(reporter, paint.getFilterLevel() == levels[i]);
+            REPORTER_ASSERT(reporter, paint.getHinting() == hinting[j]);
+
+            SkWriteBuffer writer;
+            paint.flatten(writer);
+
+            const uint32_t* written = writer.getWriter32()->contiguousArray();
+            SkReadBuffer reader(written, writer.bytesWritten());
+            
+            SkPaint paint2;
+            paint2.unflatten(reader);
+            REPORTER_ASSERT(reporter, paint2.getFilterLevel() == levels[i]);
+            REPORTER_ASSERT(reporter, paint2.getHinting() == hinting[j]);
+        }
+    }
+}
+
 // found and fixed for android: not initializing rect for string's of length 0
 DEF_TEST(Paint_regression_measureText, reporter) {
 
     SkPaint paint;
     paint.setTextSize(12.0f);
 
     SkRect r;
     r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN);
 
     // test that the rect was reset
@@ skipping 29 matching lines @@
     ASSERT(other.getColor()      == paint.getColor());
     ASSERT(other.getTextScaleX() == paint.getTextScaleX());
     ASSERT(other.getTextSize()   == paint.getTextSize());
     ASSERT(other.getLooper()     == paint.getLooper());
 
     // We have to be a little looser and compare just the modes.  Pointers might not be the same.
     SkXfermode::Mode otherMode, paintMode;
     ASSERT(other.getXfermode()->asMode(&otherMode));
     ASSERT(paint.getXfermode()->asMode(&paintMode));
     ASSERT(otherMode == paintMode);
+
+    test_filter_flags(r);
 }