commit 200ce4bbcade1d905ceaa334f4ab1ab6bea2612a
author Andrew Top <aabtop@google.com> Mon Jan 29 13:43:50 2018 -0800
committer Andrew Top <aabtop@google.com> Mon Jan 29 13:59:02 2018 -0800
tree 2ff2aa258a9e510a4c8aaf83fbbb388dda8266c0
parent e707605df29e9a4035db89ed4df307adebea0290

Import Cobalt 16.136005

Change-Id: I2b9198982828ad841d50902b145910c0aeb689d3

src/third_party/skia/gm/imageresizetiled.cpp

diff --git a/src/third_party/skia/gm/imageresizetiled.cpp b/src/third_party/skia/gm/imageresizetiled.cpp
index d09fd27..257e0b2 100644
--- a/src/third_party/skia/gm/imageresizetiled.cpp
+++ b/src/third_party/skia/gm/imageresizetiled.cpp
@@ -6,7 +6,8 @@
  */
 
 #include "gm.h"
-#include "SkMatrixImageFilter.h"
+#include "sk_tool_utils.h"
+#include "SkImageFilter.h"
 #include "SkRandom.h"
 
 #define WIDTH 640
@@ -14,41 +15,21 @@
 
 #define RESIZE_FACTOR SkIntToScalar(2)
 
-namespace skiagm {
-
-class ImageResizeTiledGM : public GM {
-public:
-    ImageResizeTiledGM() {
-    }
-
-protected:
-    virtual uint32_t onGetFlags() const SK_OVERRIDE { return kNoBBH_Flag; }
-
-    virtual SkString onShortName() SK_OVERRIDE {
-        return SkString("imageresizetiled");
-    }
-
-    virtual SkISize onISize() SK_OVERRIDE {
-        return SkISize::Make(WIDTH, HEIGHT);
-    }
-
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+DEF_SIMPLE_GM(imageresizetiled, canvas, WIDTH, HEIGHT) {
         SkPaint paint;
         SkMatrix matrix;
         matrix.setScale(RESIZE_FACTOR, RESIZE_FACTOR);
-        SkAutoTUnref<SkImageFilter> imageFilter(
-            SkMatrixImageFilter::Create(matrix, SkPaint::kNone_FilterLevel));
-        paint.setImageFilter(imageFilter.get());
+        paint.setImageFilter(SkImageFilter::MakeMatrixFilter(matrix,
+                                                             kNone_SkFilterQuality,
+                                                             nullptr));
         const SkScalar tile_size = SkIntToScalar(100);
-        SkRect bounds;
-        canvas->getClipBounds(&bounds);
         for (SkScalar y = 0; y < HEIGHT; y += tile_size) {
             for (SkScalar x = 0; x < WIDTH; x += tile_size) {
                 canvas->save();
                 canvas->clipRect(SkRect::MakeXYWH(x, y, tile_size, tile_size));
                 canvas->scale(SkScalarInvert(RESIZE_FACTOR),
                               SkScalarInvert(RESIZE_FACTOR));
-                canvas->saveLayer(NULL, &paint);
+                canvas->saveLayer(nullptr, &paint);
                 const char* str[] = {
                     "The quick",
                     "brown fox",
@@ -62,21 +43,11 @@
                 int posY = 0;
                 for (unsigned i = 0; i < SK_ARRAY_COUNT(str); i++) {
                     posY += 100;
-                    canvas->drawText(str[i], strlen(str[i]), SkIntToScalar(0),
+                    canvas->drawString(str[i], SkIntToScalar(0),
                                      SkIntToScalar(posY), textPaint);
                 }
                 canvas->restore();
                 canvas->restore();
             }
         }
-    }
-
-private:
-    typedef GM INHERITED;
-};
-
-//////////////////////////////////////////////////////////////////////////////
-
-DEF_GM(return new ImageResizeTiledGM(); )
-
 }