commit b7061176c7f414616fe2e79e832b3e0abe326af6
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 06 14:16:12 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 06 14:16:12 2013 +0000
tree 05269431ac1dfa9b62d5fa34a0351e2f21af712e
parent b27eba7c28c7a52e6af91743ab51c266ed96dccd

Push sigma-based blur interface into our GMs/benches/tests/samplecode

https://codereview.chromium.org/23701006/



git-svn-id: http://skia.googlecode.com/svn/trunk@11129 2bbb7eff-a529-9590-31e7-b0007b416f81

src/animator/SkDrawBlur.cpp

diff --git a/src/animator/SkDrawBlur.cpp b/src/animator/SkDrawBlur.cpp
index d66fc56..549aa0d 100644
--- a/src/animator/SkDrawBlur.cpp
+++ b/src/animator/SkDrawBlur.cpp
@@ -12,20 +12,21 @@
 #if SK_USE_CONDENSED_INFO == 0
 
 const SkMemberInfo SkDrawBlur::fInfo[] = {
-    SK_MEMBER(blurStyle, MaskFilterBlurStyle),
-    SK_MEMBER(radius, Float)
+    SK_MEMBER(fBlurStyle, MaskFilterBlurStyle),
+    SK_MEMBER(fSigma, Float)
 };
 
 #endif
 
 DEFINE_GET_MEMBER(SkDrawBlur);
 
-SkDrawBlur::SkDrawBlur() : radius(-1),
-    blurStyle(SkBlurMaskFilter::kNormal_BlurStyle) {
+SkDrawBlur::SkDrawBlur() 
+    : fSigma(-1)
+    , fBlurStyle(SkBlurMaskFilter::kNormal_BlurStyle) {
 }
 
 SkMaskFilter* SkDrawBlur::getMaskFilter() {
-    if (radius < 0)
+    if (fSigma < 0)
         return NULL;
-    return SkBlurMaskFilter::Create(radius, (SkBlurMaskFilter::BlurStyle) blurStyle);
+    return SkBlurMaskFilter::Create((SkBlurMaskFilter::BlurStyle) fBlurStyle, fSigma);
 }

src/animator/SkDrawBlur.h

diff --git a/src/animator/SkDrawBlur.h b/src/animator/SkDrawBlur.h
index 24cb4ae..0c916a3 100644
--- a/src/animator/SkDrawBlur.h
+++ b/src/animator/SkDrawBlur.h
@@ -16,10 +16,12 @@
 class SkDrawBlur : public SkDrawMaskFilter {
     DECLARE_DRAW_MEMBER_INFO(Blur);
     SkDrawBlur();
-    virtual SkMaskFilter* getMaskFilter();
+    virtual SkMaskFilter* getMaskFilter() SK_OVERRIDE;
 protected:
-    SkScalar radius;
-    int /*SkBlurMaskFilter::BlurStyle*/ blurStyle;
+    SkScalar fSigma;
+    int /*SkBlurMaskFilter::BlurStyle*/ fBlurStyle;
+
+    typedef SkDrawMaskFilter INHERITED;
 };
 
 #endif // SkDrawBlur_DEFINED