Always return ImageShader, even from SkShader::MakeBitmapShader

tests/BlitRowTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 177 matching lines @@
 static void test_diagonal(skiatest::Reporter* reporter) {
     static const int W = 64;
     static const int H = W;
 
     static const SkColorType gDstColorType[] = {
         kN32_SkColorType,
         kRGB_565_SkColorType,
     };
 
     static const SkColor gDstBG[] = { 0, 0xFFFFFFFF };
-
-    SkPaint paint;
+    const SkRect srcR = SkRect::MakeIWH(W, H);
 
     SkBitmap srcBM;
     srcBM.allocN32Pixels(W, H);
-    SkRect srcR = {
-        0, 0, SkIntToScalar(srcBM.width()), SkIntToScalar(srcBM.height()) };
-
-    // cons up a mesh to draw the bitmap with
-    Mesh mesh(srcBM, &paint);
-
-    SkImageInfo info = SkImageInfo::Make(W, H, kUnknown_SkColorType,
-                                         kPremul_SkAlphaType);
+    SkImageInfo info = SkImageInfo::Make(W, H, kUnknown_SkColorType, kPremul_SkAlphaType);
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gDstColorType); i++) {
         info = info.makeColorType(gDstColorType[i]);
 
         SkBitmap dstBM0, dstBM1;
         dstBM0.allocPixels(info);
         dstBM1.allocPixels(info);
 
         SkCanvas canvas0(dstBM0);
         SkCanvas canvas1(dstBM1);
         SkColor bgColor;
 
         for (size_t j = 0; j < SK_ARRAY_COUNT(gDstBG); j++) {
             bgColor = gDstBG[j];
 
             for (int c = 0; c <= 0xFF; c++) {
+                // cons up a mesh to draw the bitmap with
+                SkPaint paint;
                 srcBM.eraseARGB(0xFF, c, c, c);
+                Mesh mesh(srcBM, &paint);
 
                 for (int k = 0; k < 4; k++) {
                     bool dither = (k & 1) != 0;
                     uint8_t alpha = (k & 2) ? 0x80 : 0xFF;
                     paint.setDither(dither);
                     paint.setAlpha(alpha);
 
                     dstBM0.eraseColor(bgColor);
                     dstBM1.eraseColor(bgColor);
 
@@ skipping 15 matching lines @@
                 }
             }
         }
     }
 }
 
 DEF_TEST(BlitRow, reporter) {
     test_00_FF(reporter);
     test_diagonal(reporter);
 }