Refactor bitmap scaler to make it easier to migrate rest of chrome to use it

src/core/SkBitmapProcState.h

 
 /*
  * Copyright 2007 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.
  */
 
 
 #ifndef SkBitmapProcState_DEFINED
@@ skipping 15 matching lines @@
     #define SkFractionalIntToInt(x)     SkFixed48ToInt(x)
 #else
     typedef SkFixed    SkFractionalInt;
     #define SkScalarToFractionalInt(x)  SkScalarToFixed(x)
     #define SkFractionalIntToFixed(x)   (x)
     #define SkFixedToFractionalInt(x)   (x)
     #define SkFractionalIntToInt(x)     ((x) >> 16)
 #endif
 
 class SkPaint;
-struct SkConvolutionProcs;
 
 struct SkBitmapProcState {
 
     SkBitmapProcState(): fScaledCacheID(NULL), fBitmapFilter(NULL) {}
     ~SkBitmapProcState();
 
     typedef void (*ShaderProc32)(const SkBitmapProcState&, int x, int y,
                                  SkPMColor[], int count);
 
     typedef void (*ShaderProc16)(const SkBitmapProcState&, int x, int y,
@@ skipping 50 matching lines @@
         fMatrixProc
         fSampleProc32
         fSampleProc32
 
         They will already have valid function pointers, so a platform that does
         not have an accelerated version can just leave that field as is. A valid
         implementation can do nothing (see SkBitmapProcState_opts_none.cpp)
      */
     void platformProcs();
 
-    /** Platforms can also optionally overwrite the convolution functions
-        if we have SIMD versions of them.
-      */
-
-    void platformConvolutionProcs(SkConvolutionProcs*);
-
     /** Given the byte size of the index buffer to be passed to the matrix proc,
         return the maximum number of resulting pixels that can be computed
         (i.e. the number of SkPMColor values to be written by the sample proc).
         This routine takes into account that filtering and scale-vs-affine
         affect the amount of buffer space needed.
 
         Only valid to call after chooseProcs (setContext) has been called. It is
         safe to call this inside the shader's shadeSpan() method.
      */
     int maxCountForBufferSize(size_t bufferSize) const;
@@ skipping 100 matching lines @@
 void S32_D16_filter_DX(const SkBitmapProcState& s,
                        const uint32_t* xy, int count, uint16_t* colors);
 
 void highQualityFilter32(const SkBitmapProcState &s, int x, int y,
                          SkPMColor *SK_RESTRICT colors, int count);
 void highQualityFilter16(const SkBitmapProcState &s, int x, int y,
                          uint16_t *SK_RESTRICT colors, int count);
 
 
 #endif