AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unused ConvertRadiusToSigma from SkBlurMaskFilter

Browse Source 
Bug: skia:
Change-Id: I1726f22fc40ad61b1b0485bcda6d383614da1fdb
Reviewed-on: https://skia-review.googlesource.com/113463
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2018-03-09 16:18:56 -05:00 committed by Skia Commit-Bot
parent 3be061cd8b
commit 8e03f6930f
8 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gn/core.gni
View File

@ -56,6 +56,8 @@ skia_core_sources = [
"$_src/core/SkBlitter_RGB565.cpp",
"$_src/core/SkBlitter_Sprite.cpp",
"$_src/core/SkBlurImageFilter.cpp",
"$_src/core/SkBlurMask.cpp",
"$_src/core/SkBlurMask.h",
"$_src/core/SkBuffer.cpp",
"$_src/core/SkCachedData.cpp",
"$_src/core/SkCanvas.cpp",

2
gn/effects.gni
View File

@ -19,8 +19,6 @@ skia_effects_sources = [
"$_src/effects/Sk2DPathEffect.cpp",
"$_src/effects/SkAlphaThresholdFilter.cpp",
"$_src/effects/SkArithmeticImageFilter.cpp",
"$_src/effects/SkBlurMask.cpp",
"$_src/effects/SkBlurMask.h",
"$_src/effects/SkBlurMaskFilter.cpp",
"$_src/effects/SkColorFilterImageFilter.cpp",
"$_src/effects/SkColorMatrix.cpp",

6
include/effects/SkBlurMaskFilter.h
View File

@ -18,12 +18,6 @@ class SkRRect;
class SK_API SkBlurMaskFilter {
public:
/**
* If radius > 0, return the corresponding sigma, else return 0. Use this to convert from the
* (legacy) idea of specify the blur "radius" to the standard notion of specifying its sigma.
*/
static SkScalar ConvertRadiusToSigma(SkScalar radius);
enum BlurFlags {
kNone_BlurFlag = 0x00,
/** The blur layer's radius is not affected by transforms */

0
src/effects/SkBlurMask.cpp → src/core/SkBlurMask.cpp
View File

0
src/effects/SkBlurMask.h → src/core/SkBlurMask.h
View File

4
src/effects/SkBlurMaskFilter.cpp
View File

@ -39,10 +39,6 @@
#include "glsl/GrGLSLUniformHandler.h"
#endif
SkScalar SkBlurMaskFilter::ConvertRadiusToSigma(SkScalar radius) {
return SkBlurMask::ConvertRadiusToSigma(radius);
}
class SkBlurMaskFilterImpl : public SkMaskFilterBase {
public:
SkBlurMaskFilterImpl(SkScalar sigma, SkBlurStyle, const SkRect& occluder, uint32_t flags);

2
src/gpu/effects/GrRectBlurEffect.h
View File

@ -11,10 +11,10 @@
#ifndef GrRectBlurEffect_DEFINED
#define GrRectBlurEffect_DEFINED
#include "SkTypes.h"
#include "SkBlurMask.h"
#if SK_SUPPORT_GPU
#include "GrProxyProvider.h"
#include "../effects/SkBlurMask.h"
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
class GrRectBlurEffect : public GrFragmentProcessor {

5
src/utils/SkShadowUtils.cpp
View File

@ -6,6 +6,7 @@
*/
#include "SkShadowUtils.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
@ -640,7 +641,7 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) {
paint.setColor(rec.fAmbientColor);
paint.setStrokeWidth(strokeWidth);
paint.setStyle(SkPaint::kStrokeAndFill_Style);
SkScalar sigma = SkBlurMaskFilter::ConvertRadiusToSigma(blurRadius);
SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(blurRadius);
uint32_t flags = SkBlurMaskFilter::kIgnoreTransform_BlurFlag;
paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, sigma, flags));
this->drawPath(devSpacePath, paint);
@ -725,7 +726,7 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) {
SkPaint paint;
paint.setColor(rec.fSpotColor);
SkScalar sigma = SkBlurMaskFilter::ConvertRadiusToSigma(radius);
SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(radius);
uint32_t flags = SkBlurMaskFilter::kIgnoreTransform_BlurFlag;
paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, sigma, flags));
this->drawPath(path, paint);