| Index: src/effects/SkBlurMask.h
|
| diff --git a/src/effects/SkBlurMask.h b/src/effects/SkBlurMask.h
|
| index eb67d4c9f8b04f9443123c9f3c10b3a9a9a39567..81a8bdc5565e288487c39a37fa2cccfde9199f84 100644
|
| --- a/src/effects/SkBlurMask.h
|
| +++ b/src/effects/SkBlurMask.h
|
| @@ -1,4 +1,3 @@
|
| -
|
| /*
|
| * Copyright 2006 The Android Open Source Project
|
| *
|
| @@ -6,48 +5,30 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -
|
| #ifndef SkBlurMask_DEFINED
|
| #define SkBlurMask_DEFINED
|
|
|
| +#include "SkBlurTypes.h"
|
| #include "SkShader.h"
|
| #include "SkMask.h"
|
| #include "SkRRect.h"
|
|
|
| class SkBlurMask {
|
| public:
|
| - enum Style {
|
| - kNormal_Style, //!< fuzzy inside and outside
|
| - kSolid_Style, //!< solid inside, fuzzy outside
|
| - kOuter_Style, //!< nothing inside, fuzzy outside
|
| - kInner_Style, //!< fuzzy inside, nothing outside
|
| -
|
| - kStyleCount
|
| - };
|
| -
|
| - enum Quality {
|
| - kLow_Quality, //!< box blur
|
| - kHigh_Quality //!< three pass box blur (similar to gaussian)
|
| - };
|
| -
|
| - static bool BlurRect(SkScalar sigma, SkMask *dst, const SkRect &src,
|
| - Style style,
|
| + static bool BlurRect(SkScalar sigma, SkMask *dst, const SkRect &src, SkBlurStyle,
|
| SkIPoint *margin = NULL,
|
| SkMask::CreateMode createMode =
|
| SkMask::kComputeBoundsAndRenderImage_CreateMode);
|
| - static bool BlurRRect(SkScalar sigma, SkMask *dst, const SkRRect &src,
|
| - Style style,
|
| + static bool BlurRRect(SkScalar sigma, SkMask *dst, const SkRRect &src, SkBlurStyle,
|
| SkIPoint *margin = NULL,
|
| SkMask::CreateMode createMode =
|
| SkMask::kComputeBoundsAndRenderImage_CreateMode);
|
| - static bool BoxBlur(SkMask* dst, const SkMask& src,
|
| - SkScalar sigma, Style style, Quality quality,
|
| + static bool BoxBlur(SkMask* dst, const SkMask& src, SkScalar sigma, SkBlurStyle, SkBlurQuality,
|
| SkIPoint* margin = NULL);
|
|
|
| // the "ground truth" blur does a gaussian convolution; it's slow
|
| // but useful for comparison purposes.
|
| - static bool BlurGroundTruth(SkScalar sigma, SkMask* dst, const SkMask& src,
|
| - Style style,
|
| + static bool BlurGroundTruth(SkScalar sigma, SkMask* dst, const SkMask& src, SkBlurStyle,
|
| SkIPoint* margin = NULL);
|
|
|
| static SkScalar ConvertRadiusToSigma(SkScalar radius);
|
|
|