Run noise shader separately in imagefiltersclipped

gm/imagefiltersclipped.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 "sk_tool_utils.h"
 #include "SkBitmapSource.h"
 #include "SkBlurImageFilter.h"
@@ skipping 73 matching lines @@
                 SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode),
             SkDisplacementMapEffect::Create(SkDisplacementMapEffect::kR_ChannelSelectorType,
                                             SkDisplacementMapEffect::kR_ChannelSelectorType,
                                             SkIntToScalar(12),
                                             gradient.get(),
                                             checkerboard.get()),
             SkDilateImageFilter::Create(2, 2, checkerboard.get()),
             SkErodeImageFilter::Create(2, 2, checkerboard.get()),
             SkOffsetImageFilter::Create(SkIntToScalar(-16), SkIntToScalar(32)),
             SkImageFilter::CreateMatrixFilter(resizeMatrix, kNone_SkFilterQuality),
-            SkRectShaderImageFilter::Create(noise),
         };
 
         SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
         SkScalar margin = SkIntToScalar(16);
         SkRect bounds = r;
         bounds.outset(margin, margin);
 
+        canvas->save();
         for (int xOffset = 0; xOffset < 80; xOffset += 16) {
             canvas->save();
             bounds.fLeft = SkIntToScalar(xOffset);
             for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
                 SkPaint paint;
                 paint.setColor(SK_ColorWHITE);
                 paint.setImageFilter(filters[i]);
                 paint.setAntiAlias(true);
                 canvas->save();
                 canvas->clipRect(bounds);
                 if (5 == i) {
                     canvas->translate(SkIntToScalar(16), SkIntToScalar(-32));
                 } else if (6 == i) {
                     canvas->scale(SkScalarInvert(RESIZE_FACTOR_X),
                                   SkScalarInvert(RESIZE_FACTOR_Y));
                 }
                 canvas->drawCircle(r.centerX(), r.centerY(), r.width() * 2 / 5, paint);
                 canvas->restore();
                 canvas->translate(r.width() + margin, 0);
             }
             canvas->restore();
             canvas->translate(0, r.height() + margin);
         }
+        canvas->restore();
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
             SkSafeUnref(filters[i]);
         }
+

[robertphillips, 2015/07/21 14:38:41]

leak?
Mv 'noise' down here too?

[jvanverth1, 2015/07/21 15:30:45]

Done.

+        SkImageFilter* rectFilter = SkRectShaderImageFilter::Create(noise);
+        canvas->translate(SK_ARRAY_COUNT(filters)*(r.width() + margin), 0);
+        for (int xOffset = 0; xOffset < 80; xOffset += 16) {

[robertphillips, 2015/07/21 14:38:42]

Would it be clearer if this were a subroutine:

draw(canvas, clipRect/bounds, filter)

?

[jvanverth1, 2015/07/21 15:30:45]

Done.

+            canvas->save();
+            bounds.fLeft = SkIntToScalar(xOffset);
+            SkPaint paint;
+            paint.setColor(SK_ColorWHITE);
+            paint.setImageFilter(rectFilter);
+            paint.setAntiAlias(true);
+            canvas->clipRect(bounds);
+            canvas->drawCircle(r.centerX(), r.centerY(), r.width() * 2 / 5, paint);
+            canvas->restore();
+            canvas->translate(0, r.height() + margin);
+        }
     }
 
 private:
     bool fInitialized;
     SkBitmap fCheckerboard;
     SkBitmap fGradientCircle;
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ImageFiltersClippedGM; }
 static GMRegistry reg(MyFactory);
 
 }