Add an image filter row to GM:lcdtextprops

gm/lcdtext.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.
  */
 
 
 /* Tests text rendering with LCD and subpixel rendering turned on and off.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 
+#include "SkPicture.h"
+#include "SkPictureImageFilter.h"
+#include "SkPictureRecorder.h"
+
 class LcdTextGM : public skiagm::GM {
 public:
     LcdTextGM() {
         const int pointSize = 36;
         textHeight = SkIntToScalar(pointSize);
     }
     
 protected:
     
     SkString onShortName() {
@@ skipping 105 matching lines @@
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setLCDRenderText(true);
         paint.setTextSize(30);
         canvas->drawText("Base", 4, 4, 30, paint);
         canvas->saveLayer(NULL, NULL);
         canvas->drawText("Layer", 5, 4, 70, paint);
         canvas->restore();
     }
 
+    static SkSurface* MakeSurface(SkCanvas* canvas, const SkImageInfo& info, SkPixelGeometry geo) {
+        SkSurfaceProps props = SkSurfaceProps(0, geo);
+        SkSurface* surface = canvas->newSurface(info, &props);
+
+        if (!surface) {
+            surface = SkSurface::NewRaster(info, &props);
+        }
+
+        return surface;
+    }
+
 protected:
     SkString onShortName() SK_OVERRIDE {
         return SkString("lcdtextprops");
     }
 
     SkISize onISize() SK_OVERRIDE { return SkISize::Make(230, 120); }
 
     uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkip565_Flag;
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         const SkPixelGeometry geos[] = {
             kRGB_H_SkPixelGeometry,
             kUnknown_SkPixelGeometry,
         };
 
         const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
+        SkPictureRecorder recorder;

[reed1, 2014/11/19 16:39:24]

maybe we can move this building-the-paint into the constructor, or
onOnceBeforeDraw, just for clarity.

[f(malita), 2014/11/19 17:08:59]

Done.

+        DrawText(recorder.beginRecording(SkIntToScalar(info.width()),
+                                         SkIntToScalar(info.height())));
+        SkAutoTUnref<SkPicture> pic(recorder.endRecording());
+        SkAutoTUnref<SkImageFilter> filter(SkPictureImageFilter::Create(pic.get()));
+        SkPaint filterPaint;
+        filterPaint.setImageFilter(filter.get());
+
         for (size_t i = 0; i < SK_ARRAY_COUNT(geos); ++i) {
-            SkSurfaceProps props = SkSurfaceProps(0, geos[i]);
-            SkAutoTUnref<SkSurface> surf(canvas->newSurface(info, &props));
-            if (!surf) {
-                surf.reset(SkSurface::NewRaster(info, &props));
-            }
+            SkAutoTUnref<SkSurface> surf(MakeSurface(canvas, info, geos[i]));
             DrawText(surf->getCanvas());
             surf->draw(canvas, SkIntToScalar(i * (info.width() + 10)), 0, NULL);
         }
+
+        for (size_t i = 0; i < SK_ARRAY_COUNT(geos); ++i) {
+            SkAutoTUnref<SkSurface> surf(MakeSurface(canvas, info, geos[i]));
+            surf->getCanvas()->saveLayer(NULL, &filterPaint);
+            surf->getCanvas()->restore();
+            surf->draw(canvas,
+                       SkIntToScalar(i * (info.width() + 10)),
+                       SkIntToScalar(info.height() + 10),
+                       NULL);
+        }
     }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new LcdTextGM; )
 DEF_GM( return new LcdTextSizeGM; )
 // Temporarily disabled (dftext interference)
 // DEF_GM( return new LcdTextProps; )