stop using bitmap-filter flags outside of paint itself, as a step towards really changing them into…

src/opts/SkBitmapProcState_opts_SSSE3.cpp

 /*
  * Copyright 2012 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 <tmmintrin.h>  // SSSE3
 #include "SkBitmapProcState_opts_SSSE3.h"
+#include "SkPaint.h"
 #include "SkUtils.h"
 
 // adding anonymous namespace seemed to force gcc to inline directly the
 // instantiation, instead of creating the functions
 // S32_generic_D32_filter_DX_SSSE3<true> and
 // S32_generic_D32_filter_DX_SSSE3<false> which were then called by the
 // external functions.
 namespace {
 // In this file, variations for alpha and non alpha versions are implemented
 // with a template, as it makes the code more compact and a bit easier to
@@ skipping 358 matching lines @@
 // 16 bits because the results are 16 bits. This basically allows us to process
 // twice as many pixel components per iteration.
 //
 // As a result, this method behaves faster than the traditional SSE2. The actual
 // boost varies greatly on the underlying architecture.
 template<bool has_alpha>
 void S32_generic_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
                                      const uint32_t* xy,
                                      int count, uint32_t* colors) {
     SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterQuality != SkBitmapProcState::kNone_BitmapFilter);
+    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
     SkASSERT(s.fBitmap->config() == SkBitmap::kARGB_8888_Config);
     if (has_alpha) {
         SkASSERT(s.fAlphaScale < 256);
     } else {
         SkASSERT(s.fAlphaScale == 256);
     }
 
     const uint8_t* src_addr =
             static_cast<const uint8_t*>(s.fBitmap->getPixels());
     const size_t rb = s.fBitmap->rowBytes();
@@ skipping 170 matching lines @@
 
 /*
  * Similar to S32_generic_D32_filter_DX_SSSE3, we do not need to handle the
  * special case suby == 0 as suby is changing in every loop.
  */
 template<bool has_alpha>
 void S32_generic_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
                                        const uint32_t* xy,
                                        int count, uint32_t* colors) {
     SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterQuality != SkBitmapProcState::kNone_BitmapFilter);
+    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
     SkASSERT(s.fBitmap->config() == SkBitmap::kARGB_8888_Config);
     if (has_alpha) {
         SkASSERT(s.fAlphaScale < 256);
     } else {
         SkASSERT(s.fAlphaScale == 256);
     }
 
     const uint8_t* src_addr =
                         static_cast<const uint8_t*>(s.fBitmap->getPixels());
     const size_t rb = s.fBitmap->rowBytes();
@@ skipping 124 matching lines @@
                                     const uint32_t* xy,
                                     int count, uint32_t* colors) {
     S32_generic_D32_filter_DXDY_SSSE3<false>(s, xy, count, colors);
 }
 
 void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
                                    const uint32_t* xy,
                                    int count, uint32_t* colors) {
     S32_generic_D32_filter_DXDY_SSSE3<true>(s, xy, count, colors);
 }