remove dead code (covered by surfaceprops)

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.
  */
@@ skipping 108 matching lines @@
             paint.setTextSize(rec[i].fTextSize);
             ScaleAbout(canvas, rec[i].fScale, rec[i].fScale, loc.x(), loc.y());
             canvas->drawText(rec[i].fText, strlen(rec[i].fText), loc.x(), loc.y(), paint);
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
-// ensure that we respect the SkPixelGeometry in SurfaceProps
-class LcdTextProps : public skiagm::GM {
-    static void DrawText(SkCanvas* canvas) {
-        canvas->drawColor(SK_ColorWHITE);
-        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, 230); }
-
-    void onOnceBeforeDraw() SK_OVERRIDE {
-        fInfo = SkImageInfo::MakeN32Premul(100, 100);
-        SkPictureRecorder recorder;
-        DrawText(recorder.beginRecording(SkIntToScalar(fInfo.width()),
-                                         SkIntToScalar(fInfo.height())));
-        SkAutoTUnref<SkPicture> pic(recorder.endRecording());
-        SkAutoTUnref<SkImageFilter> filter(SkPictureImageFilter::Create(pic.get()));
-        fFilterPaint.setImageFilter(filter.get());
-    }
-
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        const SkPixelGeometry geos[] = {
-            kRGB_H_SkPixelGeometry,
-            kUnknown_SkPixelGeometry,
-        };
-
-        for (size_t i = 0; i < SK_ARRAY_COUNT(geos); ++i) {
-            SkAutoTUnref<SkSurface> surf(MakeSurface(canvas, fInfo, geos[i]));
-            DrawText(surf->getCanvas());
-            surf->draw(canvas, SkIntToScalar(i * (fInfo.width() + 10)), 0, NULL);
-        }
-
-        for (size_t i = 0; i < SK_ARRAY_COUNT(geos); ++i) {
-            SkAutoTUnref<SkSurface> surf(MakeSurface(canvas, fInfo, geos[i]));
-            surf->getCanvas()->saveLayer(NULL, &fFilterPaint);
-            surf->getCanvas()->restore();
-            surf->draw(canvas,
-                       SkIntToScalar(i * (fInfo.width() + 10)),
-                       SkIntToScalar(fInfo.height() + 10),
-                       NULL);
-        }
-    }
-
-private:
-    SkPaint     fFilterPaint;
-    SkImageInfo fInfo;
-
-    typedef skiagm::GM INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
 DEF_GM( return new LcdTextGM; )
 DEF_GM( return new LcdTextSizeGM; )
-// Temporarily disabled (dftext interference)
-// DEF_GM( return new LcdTextProps; )