diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-15 15:48:36 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-15 15:48:36 +0000 |
commit | 73cb15351f33459e0c861a96135c634dec77ef9d (patch) | |
tree | cf521a48286c5cd88354056e65a933cc63f8fbe1 /gm/shadows.cpp | |
parent | beb8b3a4da83ce30e313e72ae0e444870acecb7e (diff) |
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
Diffstat (limited to 'gm/shadows.cpp')
-rw-r--r-- | gm/shadows.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/gm/shadows.cpp b/gm/shadows.cpp index d0d23a8047..44fa8e22bf 100644 --- a/gm/shadows.cpp +++ b/gm/shadows.cpp @@ -47,42 +47,42 @@ protected: virtual void onDraw(SkCanvas* canvas) { SkBlurDrawLooper* shadowLoopers[5]; shadowLoopers[0] = - new SkBlurDrawLooper (SK_ColorBLUE, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)), - SkIntToScalar(5), SkIntToScalar(10), - SkBlurDrawLooper::kIgnoreTransform_BlurFlag | - SkBlurDrawLooper::kOverrideColor_BlurFlag | - SkBlurDrawLooper::kHighQuality_BlurFlag); + SkBlurDrawLooper::Create(SK_ColorBLUE, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)), + SkIntToScalar(5), SkIntToScalar(10), + SkBlurDrawLooper::kIgnoreTransform_BlurFlag | + SkBlurDrawLooper::kOverrideColor_BlurFlag | + SkBlurDrawLooper::kHighQuality_BlurFlag); SkAutoUnref aurL0(shadowLoopers[0]); shadowLoopers[1] = - new SkBlurDrawLooper (SK_ColorBLUE, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)), - SkIntToScalar(5), SkIntToScalar(10), - SkBlurDrawLooper::kIgnoreTransform_BlurFlag | - SkBlurDrawLooper::kOverrideColor_BlurFlag); + SkBlurDrawLooper::Create(SK_ColorBLUE, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)), + SkIntToScalar(5), SkIntToScalar(10), + SkBlurDrawLooper::kIgnoreTransform_BlurFlag | + SkBlurDrawLooper::kOverrideColor_BlurFlag); SkAutoUnref aurL1(shadowLoopers[1]); shadowLoopers[2] = - new SkBlurDrawLooper (SK_ColorBLACK, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)), - SkIntToScalar(5), - SkIntToScalar(10), - SkBlurDrawLooper::kIgnoreTransform_BlurFlag | - SkBlurDrawLooper::kHighQuality_BlurFlag); + SkBlurDrawLooper::Create(SK_ColorBLACK, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)), + SkIntToScalar(5), + SkIntToScalar(10), + SkBlurDrawLooper::kIgnoreTransform_BlurFlag | + SkBlurDrawLooper::kHighQuality_BlurFlag); SkAutoUnref aurL2(shadowLoopers[2]); shadowLoopers[3] = - new SkBlurDrawLooper (0x7FFF0000, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)), - SkIntToScalar(-5), SkIntToScalar(-10), - SkBlurDrawLooper::kIgnoreTransform_BlurFlag | - SkBlurDrawLooper::kOverrideColor_BlurFlag | - SkBlurDrawLooper::kHighQuality_BlurFlag); + SkBlurDrawLooper::Create(0x7FFF0000, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)), + SkIntToScalar(-5), SkIntToScalar(-10), + SkBlurDrawLooper::kIgnoreTransform_BlurFlag | + SkBlurDrawLooper::kOverrideColor_BlurFlag | + SkBlurDrawLooper::kHighQuality_BlurFlag); SkAutoUnref aurL3(shadowLoopers[3]); shadowLoopers[4] = - new SkBlurDrawLooper (SK_ColorBLACK, SkIntToScalar(0), - SkIntToScalar(5), SkIntToScalar(5), - SkBlurDrawLooper::kIgnoreTransform_BlurFlag | - SkBlurDrawLooper::kOverrideColor_BlurFlag | - SkBlurDrawLooper::kHighQuality_BlurFlag); + SkBlurDrawLooper::Create(SK_ColorBLACK, SkIntToScalar(0), + SkIntToScalar(5), SkIntToScalar(5), + SkBlurDrawLooper::kIgnoreTransform_BlurFlag | + SkBlurDrawLooper::kOverrideColor_BlurFlag | + SkBlurDrawLooper::kHighQuality_BlurFlag); SkAutoUnref aurL4(shadowLoopers[4]); static const struct { |