From 73cb15351f33459e0c861a96135c634dec77ef9d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 15 Apr 2014 15:48:36 +0000 Subject: Make sure SkDrawLooper objects can only be allocated on the heap. Make constructors of SkLayerDrawLooper and SkBlurDrawLooper non-public. Remove addLayer* methods from SkLayerDrawLooper. SkLayerDrawLooper::Builder is used to create new objects. Provide factory method for creating SkBlurDrawLooper. BUG=2141 R=scroggo@google.com, reed@google.com, djsollen@google.com Author: dominikg@chromium.org Review URL: https://codereview.chromium.org/232913003 git-svn-id: http://skia.googlecode.com/svn/trunk@14200 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/BlurRoundRectBench.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bench/BlurRoundRectBench.cpp') diff --git a/bench/BlurRoundRectBench.cpp b/bench/BlurRoundRectBench.cpp index 29c0080594..a3d0ba9fd9 100644 --- a/bench/BlurRoundRectBench.cpp +++ b/bench/BlurRoundRectBench.cpp @@ -40,7 +40,7 @@ public: } virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { - SkLayerDrawLooper* looper = new SkLayerDrawLooper; + SkLayerDrawLooper::Builder looperBuilder; { SkLayerDrawLooper::LayerInfo info; info.fPaintBits = SkLayerDrawLooper::kMaskFilter_Bit @@ -48,7 +48,7 @@ public: info.fColorMode = SkXfermode::kSrc_Mode; info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0)); info.fPostTranslate = false; - SkPaint* paint = looper->addLayerOnTop(info); + SkPaint* paint = looperBuilder.addLayerOnTop(info); SkMaskFilter* maskFilter = SkBlurMaskFilter::Create( SkBlurMaskFilter::kNormal_BlurStyle, SkBlurMask::ConvertRadiusToSigma(SK_ScalarHalf), @@ -61,13 +61,13 @@ public: } { SkLayerDrawLooper::LayerInfo info; - looper->addLayerOnTop(info); + looperBuilder.addLayerOnTop(info); } SkPaint dullPaint; dullPaint.setAntiAlias(true); SkPaint loopedPaint; - loopedPaint.setLooper(looper)->unref(); + loopedPaint.setLooper(looperBuilder.detachLooper())->unref(); loopedPaint.setAntiAlias(true); loopedPaint.setColor(SK_ColorCYAN); -- cgit v1.2.3