Convert unit tests, GMs from SkBitmapSource to SkImagesource

gm/imagefilterscropexpand.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 
-#include "SkBitmapSource.h"
 #include "SkBlurImageFilter.h"
 #include "SkColorMatrixFilter.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkDropShadowImageFilter.h"
 #include "SkGradientShader.h"
+#include "SkImageSource.h"
 #include "SkMorphologyImageFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkMergeImageFilter.h"
 #include "SkOffsetImageFilter.h"
+#include "SkSurface.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class ImageFiltersCropExpandGM : public skiagm::GM {
 public:
     ImageFiltersCropExpandGM () {}
 
 protected:
 
     virtual SkString onShortName() {
@@ skipping 15 matching lines @@
                 canvas.save();
                 canvas.translate(SkIntToScalar(x), SkIntToScalar(y));
                 canvas.drawRect(SkRect::MakeXYWH(0, 0, 8, 8), darkPaint);
                 canvas.drawRect(SkRect::MakeXYWH(8, 0, 8, 8), lightPaint);
                 canvas.drawRect(SkRect::MakeXYWH(0, 8, 8, 8), lightPaint);
                 canvas.drawRect(SkRect::MakeXYWH(8, 8, 8, 8), darkPaint);
                 canvas.restore();
             }
         }
     }
 

[robertphillips, 2015/09/15 17:43:52]

static SkImage* MakeGradientCircle(int width, int height) ?

[f(malita), 2015/09/15 18:12:53]

Done.

-    void make_gradient_circle(int width, int height, SkBitmap* bitmap) {
+    SkImage* make_gradient_circle(int width, int height) {
         SkScalar x = SkIntToScalar(width / 2);
         SkScalar y = SkIntToScalar(height / 2);
         SkScalar radius = SkMinScalar(x, y) * 0.8f;
-        bitmap->allocN32Pixels(width, height);
-        SkCanvas canvas(*bitmap);
-        canvas.clear(0x00000000);
+        SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(width, height));
+        SkCanvas* canvas = surface->getCanvas();
+        canvas->clear(0x00000000);
         SkColor colors[2];
         colors[0] = SK_ColorWHITE;
         colors[1] = SK_ColorBLACK;
         SkAutoTUnref<SkShader> shader(
             SkGradientShader::CreateRadial(SkPoint::Make(x, y), radius, colors, nullptr, 2,
                                            SkShader::kClamp_TileMode)
         );
         SkPaint paint;
         paint.setShader(shader);
-        canvas.drawCircle(x, y, radius, paint);
+        canvas->drawCircle(x, y, radius, paint);
+
+        return surface->newImageSnapshot();
     }
 
     static void draw(SkCanvas* canvas, const SkBitmap& bitmap, const SkRect& rect, SkImageFilter* filter) {
         SkPaint paint;
         paint.setImageFilter(filter)->unref();
         canvas->saveLayer(&rect, &paint);
         canvas->drawBitmap(bitmap, 0, 0);
         canvas->restore();
 
         SkPaint strokePaint;
         strokePaint.setColor(0xFFFF0000);
         strokePaint.setStyle(SkPaint::kStroke_Style);
         canvas->drawRect(rect, strokePaint);
 
         canvas->translate(SkIntToScalar(80), 0);
     }
 

[robertphillips, 2015/09/15 17:43:52]

override ?

[f(malita), 2015/09/15 18:12:53]

Done.

     virtual void onDraw(SkCanvas* canvas) {
         SkAutoTUnref<SkColorFilter> cf(
             SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
         SkImageFilter::CropRect crop_rect(
             SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)),
             SkImageFilter::CropRect::kHasAll_CropEdge);
 

[robertphillips, 2015/09/15 17:43:52]

gradientCircle ?

[f(malita), 2015/09/15 18:12:53]

Done.

-        SkBitmap gradient_circle, checkerboard;
-        make_gradient_circle(64, 64, &gradient_circle);
+        SkAutoTUnref<SkImage> gradient_circle(make_gradient_circle(64, 64));
+        SkBitmap checkerboard;
         make_checkerboard(&checkerboard);
 
         SkAutoTUnref<SkImageFilter> gradient_circle_source(
-            SkBitmapSource::Create(gradient_circle));
+            SkImageSource::Create(gradient_circle));
         SkAutoTUnref<SkImageFilter> noop_cropped(
             SkOffsetImageFilter::Create(0, 0, nullptr, &crop_rect));
         SkScalar sk255 = SkIntToScalar(255);
         SkScalar matrix[20] = { 1, 0, 0, 0, 0,
                                 0, 1, 0, 0, sk255,
                                 0, 0, 1, 0, 0,
                                 0, 0, 0, 0, sk255 };
         SkAutoTUnref<SkColorFilter> cf_alpha_trans(SkColorMatrixFilter::Create(matrix));
 
         SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
@@ skipping 45 matching lines @@
     }
 
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersCropExpandGM; }
 static skiagm::GMRegistry reg(MyFactory);