use SkPixmap inside sprite blitters

src/core/SkSpriteBlitter_ARGB32.cpp

 
 /*
  * Copyright 2006 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 "SkSpriteBlitter.h"
@@ skipping 19 matching lines @@
             flags32 |= SkBlitRow::kSrcPixelAlpha_Flag32;
         }
 
         fProc32 = SkBlitRow::Factory32(flags32);
         fAlpha = alpha;
     }
 
     void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
         uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft,
-                                                             y - fTop);
+        const uint32_t* SK_RESTRICT src = fSource->addr32(x - fLeft, y - fTop);
         size_t dstRB = fDevice->rowBytes();
         size_t srcRB = fSource->rowBytes();
         SkBlitRow::Proc32 proc = fProc32;
         U8CPU             alpha = fAlpha;
 
         do {
             proc(dst, src, width, alpha);
             dst = (uint32_t* SK_RESTRICT)((char*)dst + dstRB);
             src = (const uint32_t* SK_RESTRICT)((const char*)src + srcRB);
         } while (--height != 0);
@@ skipping 32 matching lines @@
         fProc32 = SkBlitRow::Factory32(flags32);
         fAlpha = paint.getAlpha();
     }
 
     virtual ~Sprite_D32_XferFilter() {
         delete[] fBuffer;
         SkSafeUnref(fXfermode);
         SkSafeUnref(fColorFilter);
     }
 
-    virtual void setup(const SkBitmap& device, int left, int top,
-                       const SkPaint& paint) override {
-        this->INHERITED::setup(device, left, top, paint);
+    bool setup(const SkBitmap& device, int left, int top, const SkPaint& paint) override {
+        if (!this->INHERITED::setup(device, left, top, paint)) {
+            return false;
+        }
 
         int width = device.width();
         if (width > fBufferSize) {
             fBufferSize = width;
             delete[] fBuffer;
             fBuffer = new SkPMColor[width];
         }
+        return true;
     }
 
 protected:
     SkColorFilter*      fColorFilter;
     SkXfermode*         fXfermode;
     int                 fBufferSize;
     SkPMColor*          fBuffer;
     SkBlitRow::Proc32   fProc32;
     U8CPU               fAlpha;
 
 private:
     typedef SkSpriteBlitter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class Sprite_D32_S32A_XferFilter : public Sprite_D32_XferFilter {
 public:
     Sprite_D32_S32A_XferFilter(const SkBitmap& source, const SkPaint& paint)
         : Sprite_D32_XferFilter(source, paint) {}
 
     void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
         uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft,
-                                                             y - fTop);
+        const uint32_t* SK_RESTRICT src = fSource->addr32(x - fLeft, y - fTop);
         size_t dstRB = fDevice->rowBytes();
         size_t srcRB = fSource->rowBytes();
         SkColorFilter* colorFilter = fColorFilter;
         SkXfermode* xfermode = fXfermode;
 
         do {
             const SkPMColor* tmp = src;
 
             if (colorFilter) {
                 colorFilter->filterSpan(src, width, fBuffer);
@@ skipping 25 matching lines @@
 }
 
 class Sprite_D32_S4444_XferFilter : public Sprite_D32_XferFilter {
 public:
     Sprite_D32_S4444_XferFilter(const SkBitmap& source, const SkPaint& paint)
         : Sprite_D32_XferFilter(source, paint) {}
 
     void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
         SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
-                                                                y - fTop);
+        const SkPMColor16* SK_RESTRICT src = fSource->addr16(x - fLeft, y - fTop);
         size_t dstRB = fDevice->rowBytes();
         size_t srcRB = fSource->rowBytes();
         SkPMColor* SK_RESTRICT buffer = fBuffer;
         SkColorFilter* colorFilter = fColorFilter;
         SkXfermode* xfermode = fXfermode;
 
         do {
             fillbuffer(buffer, src, width);
 
             if (colorFilter) {
@@ skipping 25 matching lines @@
     } while (--count != 0);
 }
 
 class Sprite_D32_S4444_Opaque : public SkSpriteBlitter {
 public:
     Sprite_D32_S4444_Opaque(const SkBitmap& source) : SkSpriteBlitter(source) {}
 
     void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
         SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
-                                                                y - fTop);
+        const SkPMColor16* SK_RESTRICT src = fSource->addr16(x - fLeft, y - fTop);
         size_t dstRB = fDevice->rowBytes();
         size_t srcRB = fSource->rowBytes();
 
         do {
             src_row(dst, src, width);
             dst = (SkPMColor* SK_RESTRICT)((char*)dst + dstRB);
             src = (const SkPMColor16* SK_RESTRICT)((const char*)src + srcRB);
         } while (--height != 0);
     }
 };
 
 static void srcover_row(SkPMColor* SK_RESTRICT dst,
                         const SkPMColor16* SK_RESTRICT src, int count) {
     do {
         *dst = SkPMSrcOver(SkPixel4444ToPixel32(*src), *dst);
         src += 1;
         dst += 1;
     } while (--count != 0);
 }
 
 class Sprite_D32_S4444 : public SkSpriteBlitter {
 public:
     Sprite_D32_S4444(const SkBitmap& source) : SkSpriteBlitter(source) {}
 
     void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
         SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
-                                                                y - fTop);
+        const SkPMColor16* SK_RESTRICT src = fSource->addr16(x - fLeft, y - fTop);
         size_t dstRB = fDevice->rowBytes();
         size_t srcRB = fSource->rowBytes();
 
         do {
             srcover_row(dst, src, width);
             dst = (SkPMColor* SK_RESTRICT)((char*)dst + dstRB);
             src = (const SkPMColor16* SK_RESTRICT)((const char*)src + srcRB);
         } while (--height != 0);
     }
 };
@@ skipping 35 matching lines @@
             } else {
                 // this can handle alpha, but not xfermode or filter
                 blitter = allocator->createT<Sprite_D32_S32>(source, alpha);
             }
             break;
         default:
             break;
     }
     return blitter;
 }