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 41 matching lines @@
         colors[1] = SK_ColorBLACK;
         SkAutoTUnref<SkShader> shader(
             SkGradientShader::CreateRadial(SkPoint::Make(x, y), radius, colors, NULL, 2,
                                            SkShader::kClamp_TileMode)
         );
         SkPaint paint;
         paint.setShader(shader);
         canvas.drawCircle(x, y, radius, paint);
     }
 
+    static void draw_clipped_filter(SkCanvas* canvas, SkImageFilter* filter, size_t i,
+                                    const SkRect& primBounds, const SkRect& clipBounds) {
+        SkPaint paint;
+        paint.setColor(SK_ColorWHITE);
+        paint.setImageFilter(filter);
+        paint.setAntiAlias(true);
+        canvas->save();
+        canvas->clipRect(clipBounds);
+        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(primBounds.centerX(), primBounds.centerY(),
+                           primBounds.width() * 2 / 5, paint);
+        canvas->restore();
+    }
+
     void onDraw(SkCanvas* canvas) override {
         if (!fInitialized) {
             fCheckerboard.allocN32Pixels(64, 64);
             SkCanvas checkerboardCanvas(fCheckerboard);
             sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
 
             this->make_gradient_circle(64, 64);
             fInitialized = true;
         }
         canvas->clear(SK_ColorBLACK);
@@ skipping 12 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();
+                draw_clipped_filter(canvas, filters[i], i, r, bounds);
                 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]);
         }
+
+        SkImageFilter* rectFilter = SkRectShaderImageFilter::Create(noise);
+        canvas->translate(SK_ARRAY_COUNT(filters)*(r.width() + margin), 0);
+        for (int xOffset = 0; xOffset < 80; xOffset += 16) {
+            bounds.fLeft = SkIntToScalar(xOffset);
+            draw_clipped_filter(canvas, rectFilter, 0, r, bounds);
+            canvas->translate(0, r.height() + margin);
+        }
+        SkSafeUnref(rectFilter);
     }
 
 private:
     bool fInitialized;
     SkBitmap fCheckerboard;
     SkBitmap fGradientCircle;
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ImageFiltersClippedGM; }
 static GMRegistry reg(MyFactory);
 
 }