Revert of Extract most of the mutable state of SkShader into a separate Context object.

src/core/SkBlitter_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 "SkCoreBlitters.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
@@ skipping 257 matching lines @@
 static void blend_srcmode(SkPMColor* SK_RESTRICT device,
                           const SkPMColor* SK_RESTRICT span,
                           int count, U8CPU aa) {
     int aa256 = SkAlpha255To256(aa);
     for (int i = 0; i < count; ++i) {
         device[i] = SkFourByteInterp256(span[i], device[i], aa256);
     }
 }
 
 SkARGB32_Shader_Blitter::SkARGB32_Shader_Blitter(const SkBitmap& device,
-        const SkPaint& paint, SkShader::Context* shaderContext)
-    : INHERITED(device, paint, shaderContext)
-{
+                            const SkPaint& paint) : INHERITED(device, paint) {
     fBuffer = (SkPMColor*)sk_malloc_throw(device.width() * (sizeof(SkPMColor)));
 
     fXfermode = paint.getXfermode();
     SkSafeRef(fXfermode);
 
     int flags = 0;
-    if (!(shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag)) {
+    if (!(fShader->getFlags() & SkShader::kOpaqueAlpha_Flag)) {
         flags |= SkBlitRow::kSrcPixelAlpha_Flag32;
     }
     // we call this on the output from the shader
     fProc32 = SkBlitRow::Factory32(flags);
     // we call this on the output from the shader + alpha from the aa buffer
     fProc32Blend = SkBlitRow::Factory32(flags | SkBlitRow::kGlobalAlpha_Flag32);
 
     fShadeDirectlyIntoDevice = false;
     if (fXfermode == NULL) {
-        if (shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag) {
+        if (fShader->getFlags() & SkShader::kOpaqueAlpha_Flag) {
             fShadeDirectlyIntoDevice = true;
         }
     } else {
         SkXfermode::Mode mode;
         if (fXfermode->asMode(&mode)) {
             if (SkXfermode::kSrc_Mode == mode) {
                 fShadeDirectlyIntoDevice = true;
                 fProc32Blend = blend_srcmode;
             }
         }
     }
 
-    fConstInY = SkToBool(shaderContext->getFlags() & SkShader::kConstInY32_Flag);
+    fConstInY = SkToBool(fShader->getFlags() & SkShader::kConstInY32_Flag);
 }
 
 SkARGB32_Shader_Blitter::~SkARGB32_Shader_Blitter() {
     SkSafeUnref(fXfermode);
     sk_free(fBuffer);
 }
 
 void SkARGB32_Shader_Blitter::blitH(int x, int y, int width) {
     SkASSERT(x >= 0 && y >= 0 && x + width <= fDevice.width());
 
     uint32_t*   device = fDevice.getAddr32(x, y);
 
     if (fShadeDirectlyIntoDevice) {
-        fShaderContext->shadeSpan(x, y, device, width);
+        fShader->shadeSpan(x, y, device, width);
     } else {
         SkPMColor*  span = fBuffer;
-        fShaderContext->shadeSpan(x, y, span, width);
+        fShader->shadeSpan(x, y, span, width);
         if (fXfermode) {
             fXfermode->xfer32(device, span, width, NULL);
         } else {
             fProc32(device, span, width, 255);
         }
     }
 }
 
 void SkARGB32_Shader_Blitter::blitRect(int x, int y, int width, int height) {
     SkASSERT(x >= 0 && y >= 0 &&
              x + width <= fDevice.width() && y + height <= fDevice.height());
 
-    uint32_t*          device = fDevice.getAddr32(x, y);
-    size_t             deviceRB = fDevice.rowBytes();
-    SkShader::Context* shaderContext = fShaderContext;
-    SkPMColor*         span = fBuffer;
+    uint32_t*   device = fDevice.getAddr32(x, y);
+    size_t      deviceRB = fDevice.rowBytes();
+    SkShader*   shader = fShader;
+    SkPMColor*  span = fBuffer;
 
     if (fConstInY) {
         if (fShadeDirectlyIntoDevice) {
             // shade the first row directly into the device
-            shaderContext->shadeSpan(x, y, device, width);
+            fShader->shadeSpan(x, y, device, width);
             span = device;
             while (--height > 0) {
                 device = (uint32_t*)((char*)device + deviceRB);
                 memcpy(device, span, width << 2);
             }
         } else {
-            shaderContext->shadeSpan(x, y, span, width);
+            fShader->shadeSpan(x, y, span, width);
             SkXfermode* xfer = fXfermode;
             if (xfer) {
                 do {
                     xfer->xfer32(device, span, width, NULL);
                     y += 1;
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
             } else {
                 SkBlitRow::Proc32 proc = fProc32;
                 do {
                     proc(device, span, width, 255);
                     y += 1;
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
             }
         }
         return;
     }
 
     if (fShadeDirectlyIntoDevice) {
         void* ctx;
-        SkShader::Context::ShadeProc shadeProc = shaderContext->asAShadeProc(&ctx);
+        SkShader::ShadeProc shadeProc = fShader->asAShadeProc(&ctx);
         if (shadeProc) {
             do {
                 shadeProc(ctx, x, y, device, width);
                 y += 1;
                 device = (uint32_t*)((char*)device + deviceRB);
             } while (--height > 0);
         } else {
             do {
-                shaderContext->shadeSpan(x, y, device, width);
+                shader->shadeSpan(x, y, device, width);
                 y += 1;
                 device = (uint32_t*)((char*)device + deviceRB);
             } while (--height > 0);
         }
     } else {
         SkXfermode* xfer = fXfermode;
         if (xfer) {
             do {
-                shaderContext->shadeSpan(x, y, span, width);
+                shader->shadeSpan(x, y, span, width);
                 xfer->xfer32(device, span, width, NULL);
                 y += 1;
                 device = (uint32_t*)((char*)device + deviceRB);
             } while (--height > 0);
         } else {
             SkBlitRow::Proc32 proc = fProc32;
             do {
-                shaderContext->shadeSpan(x, y, span, width);
+                shader->shadeSpan(x, y, span, width);
                 proc(device, span, width, 255);
                 y += 1;
                 device = (uint32_t*)((char*)device + deviceRB);
             } while (--height > 0);
         }
     }
 }
 
 void SkARGB32_Shader_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
                                         const int16_t runs[]) {
-    SkPMColor*         span = fBuffer;
-    uint32_t*          device = fDevice.getAddr32(x, y);
-    SkShader::Context* shaderContext = fShaderContext;
+    SkPMColor*  span = fBuffer;
+    uint32_t*   device = fDevice.getAddr32(x, y);
+    SkShader*   shader = fShader;
 
     if (fXfermode && !fShadeDirectlyIntoDevice) {
         for (;;) {
             SkXfermode* xfer = fXfermode;
 
             int count = *runs;
             if (count <= 0)
                 break;
             int aa = *antialias;
             if (aa) {
-                shaderContext->shadeSpan(x, y, span, count);
+                shader->shadeSpan(x, y, span, count);
                 if (aa == 255) {
                     xfer->xfer32(device, span, count, NULL);
                 } else {
                     // count is almost always 1
                     for (int i = count - 1; i >= 0; --i) {
                         xfer->xfer32(&device[i], &span[i], 1, antialias);
                     }
                 }
             }
             device += count;
             runs += count;
             antialias += count;
             x += count;
         }
     } else if (fShadeDirectlyIntoDevice ||
-               (shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag)) {
+               (fShader->getFlags() & SkShader::kOpaqueAlpha_Flag)) {
         for (;;) {
             int count = *runs;
             if (count <= 0) {
                 break;
             }
             int aa = *antialias;
             if (aa) {
                 if (aa == 255) {
                     // cool, have the shader draw right into the device
-                    shaderContext->shadeSpan(x, y, device, count);
+                    shader->shadeSpan(x, y, device, count);
                 } else {
-                    shaderContext->shadeSpan(x, y, span, count);
+                    shader->shadeSpan(x, y, span, count);
                     fProc32Blend(device, span, count, aa);
                 }
             }
             device += count;
             runs += count;
             antialias += count;
             x += count;
         }
     } else {
         for (;;) {
             int count = *runs;
             if (count <= 0) {
                 break;
             }
             int aa = *antialias;
             if (aa) {
-                shaderContext->shadeSpan(x, y, span, count);
+                fShader->shadeSpan(x, y, span, count);
                 if (aa == 255) {
                     fProc32(device, span, count, 255);
                 } else {
                     fProc32Blend(device, span, count, aa);
                 }
             }
             device += count;
             runs += count;
             antialias += count;
             x += count;
         }
     }
 }
 
 void SkARGB32_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
     // we only handle kA8 with an xfermode
     if (fXfermode && (SkMask::kA8_Format != mask.fFormat)) {
         this->INHERITED::blitMask(mask, clip);
         return;
     }
 
     SkASSERT(mask.fBounds.contains(clip));
 
-    SkShader::Context*  shaderContext = fShaderContext;
     SkBlitMask::RowProc proc = NULL;
     if (!fXfermode) {
         unsigned flags = 0;
-        if (shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag) {
+        if (fShader->getFlags() & SkShader::kOpaqueAlpha_Flag) {
             flags |= SkBlitMask::kSrcIsOpaque_RowFlag;
         }
         proc = SkBlitMask::RowFactory(SkBitmap::kARGB_8888_Config, mask.fFormat,
                                       (SkBlitMask::RowFlags)flags);
         if (NULL == proc) {
             this->INHERITED::blitMask(mask, clip);
             return;
         }
     }
 
     const int x = clip.fLeft;
     const int width = clip.width();
     int y = clip.fTop;
     int height = clip.height();
 
     char* dstRow = (char*)fDevice.getAddr32(x, y);
     const size_t dstRB = fDevice.rowBytes();
     const uint8_t* maskRow = (const uint8_t*)mask.getAddr(x, y);
     const size_t maskRB = mask.fRowBytes;
 
+    SkShader* shader = fShader;
     SkPMColor* span = fBuffer;
 
     if (fXfermode) {
         SkASSERT(SkMask::kA8_Format == mask.fFormat);
         SkXfermode* xfer = fXfermode;
         do {
-            shaderContext->shadeSpan(x, y, span, width);
+            shader->shadeSpan(x, y, span, width);
             xfer->xfer32((SkPMColor*)dstRow, span, width, maskRow);
             dstRow += dstRB;
             maskRow += maskRB;
             y += 1;
         } while (--height > 0);
     } else {
         do {
-            shaderContext->shadeSpan(x, y, span, width);
+            shader->shadeSpan(x, y, span, width);
             proc(dstRow, maskRow, span, width);
             dstRow += dstRB;
             maskRow += maskRB;
             y += 1;
         } while (--height > 0);
     }
 }
 
 void SkARGB32_Shader_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
     SkASSERT(x >= 0 && y >= 0 && y + height <= fDevice.height());
 
-    uint32_t*          device = fDevice.getAddr32(x, y);
-    size_t             deviceRB = fDevice.rowBytes();
-    SkShader::Context* shaderContext = fShaderContext;
+    uint32_t*   device = fDevice.getAddr32(x, y);
+    size_t      deviceRB = fDevice.rowBytes();
+    SkShader*   shader = fShader;
 
     if (fConstInY) {
         SkPMColor c;
-        shaderContext->shadeSpan(x, y, &c, 1);
+        fShader->shadeSpan(x, y, &c, 1);
 
         if (fShadeDirectlyIntoDevice) {
             if (255 == alpha) {
                 do {
                     *device = c;
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
             } else {
                 do {
                     *device = SkFourByteInterp(c, *device, alpha);
@@ skipping 13 matching lines @@
                     proc(device, &c, 1, alpha);
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
             }
         }
         return;
     }
 
     if (fShadeDirectlyIntoDevice) {
         void* ctx;
-        SkShader::Context::ShadeProc shadeProc = shaderContext->asAShadeProc(&ctx);
+        SkShader::ShadeProc shadeProc = fShader->asAShadeProc(&ctx);
         if (255 == alpha) {
             if (shadeProc) {
                 do {
                     shadeProc(ctx, x, y, device, 1);
                     y += 1;
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
             } else {
                 do {
-                    shaderContext->shadeSpan(x, y, device, 1);
+                    shader->shadeSpan(x, y, device, 1);
                     y += 1;
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
             }
         } else {    // alpha < 255
             SkPMColor c;
             if (shadeProc) {
                 do {
                     shadeProc(ctx, x, y, &c, 1);
                     *device = SkFourByteInterp(c, *device, alpha);
                     y += 1;
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
             } else {
                 do {
-                    shaderContext->shadeSpan(x, y, &c, 1);
+                    shader->shadeSpan(x, y, &c, 1);
                     *device = SkFourByteInterp(c, *device, alpha);
                     y += 1;
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
             }
         }
     } else {
         SkPMColor* span = fBuffer;
         SkXfermode* xfer = fXfermode;
         if (xfer) {
             do {
-                shaderContext->shadeSpan(x, y, span, 1);
+                shader->shadeSpan(x, y, span, 1);
                 xfer->xfer32(device, span, 1, &alpha);
                 y += 1;
                 device = (uint32_t*)((char*)device + deviceRB);
             } while (--height > 0);
         } else {
             SkBlitRow::Proc32 proc = (255 == alpha) ? fProc32 : fProc32Blend;
             do {
-                shaderContext->shadeSpan(x, y, span, 1);
+                shader->shadeSpan(x, y, span, 1);
                 proc(device, span, 1, alpha);
                 y += 1;
                 device = (uint32_t*)((char*)device + deviceRB);
             } while (--height > 0);
         }
     }
 }