start to remove lockPixels from bitmapshader

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
 #define SkBitmapProcState_DEFINED
 
 #include "SkBitmap.h"
 #include "SkBitmapFilter.h"
 #include "SkMatrix.h"
+#include "SkPaint.h"
 #include "SkScaledImageCache.h"
 
 #define FractionalInt_IS_64BIT
 
 #ifdef FractionalInt_IS_64BIT
     typedef SkFixed48    SkFractionalInt;
     #define SkScalarToFractionalInt(x)  SkScalarToFixed48(x)
     #define SkFractionalIntToFixed(x)   SkFixed48ToFixed(x)
     #define SkFixedToFractionalInt(x)   SkFixedToFixed48(x)
     #define SkFractionalIntToInt(x)     SkFixed48ToInt(x)
@@ skipping 127 matching lines @@
 
     SkBitmap            fOrigBitmap;        // CONSTRUCTOR
     SkBitmap            fScaledBitmap;      // chooseProcs
 
     SkScaledImageCache::ID* fScaledCacheID;
 
     MatrixProc chooseMatrixProc(bool trivial_matrix);
     bool chooseProcs(const SkMatrix& inv, const SkPaint&);
     ShaderProc32 chooseShaderProc32();
 
-    void possiblyScaleImage();
+    // returns false if we did not try to scale the image. In that case, we
+    // will need to "lock" its pixels some other way.
+    bool possiblyScaleImage();
+
+    // returns false if we failed to "lock" the pixels at all. Typically this
+    // means we have to abort the shader.
+    bool lockBaseBitmap();
 
     SkBitmapFilter* fBitmapFilter;
 
     // If supported, sets fShaderProc32 and fShaderProc16 and returns true,
     // otherwise returns false.
     bool setBitmapFilterProcs();
 
     // Return false if we failed to setup for fast translate (e.g. overflow)
     bool setupForTranslate();
 
@@ skipping 48 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