From c3bd8af6d5722e854feca70c40d92f4954c5b67b Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 13 Feb 2014 17:14:46 +0000 Subject: add peekPixels to SkCanvas and SkSurface fix reference to SkBaseDevice, which was only a problem in no-gpu build This reverts commit 4fa44a6bf73891b21917fb90d02beef9143bffa3. R=reed@google.com Author: reed@chromium.org Review URL: https://codereview.chromium.org/163603003 git-svn-id: http://skia.googlecode.com/svn/trunk@13432 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/imagefiltersclipped.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gm/imagefiltersclipped.cpp') diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp index 82873ab372..331ea49061 100644 --- a/gm/imagefiltersclipped.cpp +++ b/gm/imagefiltersclipped.cpp @@ -35,8 +35,7 @@ protected: void make_checkerboard() { fCheckerboard.allocN32Pixels(64, 64); - SkBitmapDevice device(fCheckerboard); - SkCanvas canvas(&device); + SkCanvas canvas(fCheckerboard); canvas.clear(0x00000000); SkPaint darkPaint; darkPaint.setColor(0xFF404040); @@ -58,10 +57,9 @@ protected: void make_gradient_circle(int width, int height) { SkScalar x = SkIntToScalar(width / 2); SkScalar y = SkIntToScalar(height / 2); - SkScalar radius = SkScalarMul(SkMinScalar(x, y), SkIntToScalar(4) / SkIntToScalar(5)); + SkScalar radius = SkMinScalar(x, y) * 0.8f; fGradientCircle.allocN32Pixels(width, height); - SkBitmapDevice device(fGradientCircle); - SkCanvas canvas(&device); + SkCanvas canvas(fGradientCircle); canvas.clear(0x00000000); SkColor colors[2]; colors[0] = SK_ColorWHITE; -- cgit v1.2.3