зеркало из https://github.com/mozilla/moz-skia.git
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10968 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
63bf68df05
Коммит
7bd141dce4
|
@ -71,7 +71,7 @@ class BlurRectGM : public skiagm::GM {
|
||||||
SkAlpha fAlpha;
|
SkAlpha fAlpha;
|
||||||
public:
|
public:
|
||||||
BlurRectGM(const char name[], PaintProc pproc, U8CPU alpha,
|
BlurRectGM(const char name[], PaintProc pproc, U8CPU alpha,
|
||||||
SkBlurMaskFilter::BlurStyle bs)
|
SkBlurMaskFilter::BlurStyle bs)
|
||||||
: fMaskFilter(SkBlurMaskFilter::Create(STROKE_WIDTH/2, bs,
|
: fMaskFilter(SkBlurMaskFilter::Create(STROKE_WIDTH/2, bs,
|
||||||
SkBlurMaskFilter::kHighQuality_BlurFlag))
|
SkBlurMaskFilter::kHighQuality_BlurFlag))
|
||||||
, fName(name)
|
, fName(name)
|
||||||
|
|
|
@ -49,7 +49,7 @@ public:
|
||||||
uint32_t flags = kNone_BlurFlag);
|
uint32_t flags = kNone_BlurFlag);
|
||||||
|
|
||||||
/** Create an emboss maskfilter
|
/** Create an emboss maskfilter
|
||||||
@param blurSigma standard deviation of the Gaussian blur to apply
|
@param blurSigma standard deviation of the Gaussian blur to apply
|
||||||
before applying lighting (e.g. 3)
|
before applying lighting (e.g. 3)
|
||||||
@param direction array of 3 scalars [x, y, z] specifying the direction of the light source
|
@param direction array of 3 scalars [x, y, z] specifying the direction of the light source
|
||||||
@param ambient 0...1 amount of ambient light
|
@param ambient 0...1 amount of ambient light
|
||||||
|
|
|
@ -80,7 +80,7 @@ private:
|
||||||
|
|
||||||
static void r0(SkLayerRasterizer* rast, SkPaint& p) {
|
static void r0(SkLayerRasterizer* rast, SkPaint& p) {
|
||||||
p.setMaskFilter(SkBlurMaskFilter::Create(SkIntToScalar(3),
|
p.setMaskFilter(SkBlurMaskFilter::Create(SkIntToScalar(3),
|
||||||
SkBlurMaskFilter::kNormal_BlurStyle,
|
SkBlurMaskFilter::kNormal_BlurStyle,
|
||||||
SkBlurMaskFilter::kNone_BlurFlag))->unref();
|
SkBlurMaskFilter::kNone_BlurFlag))->unref();
|
||||||
rast->addLayer(p, SkIntToScalar(3), SkIntToScalar(3));
|
rast->addLayer(p, SkIntToScalar(3), SkIntToScalar(3));
|
||||||
|
|
||||||
|
@ -255,9 +255,9 @@ static void apply_shader(SkPaint* paint, int index) {
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
SkScalar dir[] = { SK_Scalar1, SK_Scalar1, SK_Scalar1 };
|
SkScalar dir[] = { SK_Scalar1, SK_Scalar1, SK_Scalar1 };
|
||||||
paint->setMaskFilter(SkBlurMaskFilter::CreateEmboss(dir,
|
paint->setMaskFilter(SkBlurMaskFilter::CreateEmboss(dir,
|
||||||
SK_Scalar1/4,
|
SK_Scalar1/4,
|
||||||
SkIntToScalar(4),
|
SkIntToScalar(4),
|
||||||
SkIntToScalar(3)))->unref();
|
SkIntToScalar(3)))->unref();
|
||||||
paint->setColor(SK_ColorBLUE);
|
paint->setColor(SK_ColorBLUE);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -46,7 +46,7 @@ class XfermodesBlurView : public SampleView {
|
||||||
void draw_mode(SkCanvas* canvas, SkXfermode* mode, int alpha,
|
void draw_mode(SkCanvas* canvas, SkXfermode* mode, int alpha,
|
||||||
SkScalar x, SkScalar y) {
|
SkScalar x, SkScalar y) {
|
||||||
SkPaint p;
|
SkPaint p;
|
||||||
SkMaskFilter* mf = SkBlurMaskFilter::Create(5, SkBlurMaskFilter::kNormal_BlurStyle,
|
SkMaskFilter* mf = SkBlurMaskFilter::Create(5, SkBlurMaskFilter::kNormal_BlurStyle,
|
||||||
SkBlurMaskFilter::kNone_BlurFlag);
|
SkBlurMaskFilter::kNone_BlurFlag);
|
||||||
p.setMaskFilter(mf)->unref();
|
p.setMaskFilter(mf)->unref();
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,6 @@ SkDrawEmboss::SkDrawEmboss() : fSigma(-1) {
|
||||||
SkMaskFilter* SkDrawEmboss::getMaskFilter() {
|
SkMaskFilter* SkDrawEmboss::getMaskFilter() {
|
||||||
if (fSigma < 0 || fDirection.count() !=3)
|
if (fSigma < 0 || fDirection.count() !=3)
|
||||||
return NULL;
|
return NULL;
|
||||||
return SkBlurMaskFilter::CreateEmboss(fSigma, fDirection.begin(),
|
return SkBlurMaskFilter::CreateEmboss(fSigma, fDirection.begin(),
|
||||||
fAmbient, fSpecular);
|
fAmbient, fSpecular);
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ SkBlurDrawLooper::SkBlurDrawLooper(SkScalar radius, SkScalar dx, SkScalar dy,
|
||||||
this->init(SkBlurMask::ConvertRadiusToSigma(radius), dx, dy, color, flags);
|
this->init(SkBlurMask::ConvertRadiusToSigma(radius), dx, dy, color, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
SkBlurDrawLooper::SkBlurDrawLooper(SkColor color, SkScalar sigma,
|
SkBlurDrawLooper::SkBlurDrawLooper(SkColor color, SkScalar sigma,
|
||||||
SkScalar dx, SkScalar dy, uint32_t flags) {
|
SkScalar dx, SkScalar dy, uint32_t flags) {
|
||||||
this->init(sigma, dx, dy, color, flags);
|
this->init(sigma, dx, dy, color, flags);
|
||||||
}
|
}
|
||||||
|
|
|
@ -486,7 +486,7 @@ void SkMask_FreeImage(uint8_t* image) {
|
||||||
bool SkBlurMask::Blur(SkMask* dst, const SkMask& src,
|
bool SkBlurMask::Blur(SkMask* dst, const SkMask& src,
|
||||||
SkScalar radius, Style style, Quality quality,
|
SkScalar radius, Style style, Quality quality,
|
||||||
SkIPoint* margin) {
|
SkIPoint* margin) {
|
||||||
return SkBlurMask::BoxBlur(dst, src,
|
return SkBlurMask::BoxBlur(dst, src,
|
||||||
SkBlurMask::ConvertRadiusToSigma(radius),
|
SkBlurMask::ConvertRadiusToSigma(radius),
|
||||||
style, quality, margin);
|
style, quality, margin);
|
||||||
}
|
}
|
||||||
|
@ -510,8 +510,8 @@ bool SkBlurMask::BoxBlur(SkMask* dst, const SkMask& src,
|
||||||
// 6*rad+1 while the full Gaussian width is 6*sigma.
|
// 6*rad+1 while the full Gaussian width is 6*sigma.
|
||||||
passRadius = sigma - (1/6.0f);
|
passRadius = sigma - (1/6.0f);
|
||||||
} else {
|
} else {
|
||||||
// For the low quality path we only attempt to cover 3*sigma of the
|
// For the low quality path we only attempt to cover 3*sigma of the
|
||||||
// Gaussian blur area (1.5*sigma on each side). The single pass box
|
// Gaussian blur area (1.5*sigma on each side). The single pass box
|
||||||
// blur's kernel size is 2*rad+1.
|
// blur's kernel size is 2*rad+1.
|
||||||
passRadius = 1.5f*sigma - 0.5f;
|
passRadius = 1.5f*sigma - 0.5f;
|
||||||
}
|
}
|
||||||
|
@ -729,11 +729,11 @@ bool SkBlurMask::BlurRect(SkMask *dst, const SkRect &src,
|
||||||
SkScalar radius, Style style,
|
SkScalar radius, Style style,
|
||||||
SkIPoint *margin, SkMask::CreateMode createMode) {
|
SkIPoint *margin, SkMask::CreateMode createMode) {
|
||||||
return SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(radius),
|
return SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(radius),
|
||||||
dst, src,
|
dst, src,
|
||||||
style, margin, createMode);
|
style, margin, createMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SkBlurMask::BlurRect(SkScalar sigma, SkMask *dst,
|
bool SkBlurMask::BlurRect(SkScalar sigma, SkMask *dst,
|
||||||
const SkRect &src, Style style,
|
const SkRect &src, Style style,
|
||||||
SkIPoint *margin, SkMask::CreateMode createMode) {
|
SkIPoint *margin, SkMask::CreateMode createMode) {
|
||||||
int profile_size = SkScalarCeilToInt(6*sigma);
|
int profile_size = SkScalarCeilToInt(6*sigma);
|
||||||
|
|
|
@ -48,7 +48,7 @@ public:
|
||||||
static bool BlurRect(SkMask *dst, const SkRect &src,
|
static bool BlurRect(SkMask *dst, const SkRect &src,
|
||||||
SkScalar radius, Style style,
|
SkScalar radius, Style style,
|
||||||
SkIPoint *margin = NULL,
|
SkIPoint *margin = NULL,
|
||||||
SkMask::CreateMode createMode =
|
SkMask::CreateMode createMode =
|
||||||
SkMask::kComputeBoundsAndRenderImage_CreateMode);
|
SkMask::kComputeBoundsAndRenderImage_CreateMode);
|
||||||
// DEPRECATED - radius-based
|
// DEPRECATED - radius-based
|
||||||
static bool Blur(SkMask* dst, const SkMask& src,
|
static bool Blur(SkMask* dst, const SkMask& src,
|
||||||
|
|
|
@ -334,7 +334,7 @@ SkBlurMaskFilterImpl::SkBlurMaskFilterImpl(SkFlattenableReadBuffer& buffer)
|
||||||
fSigma = buffer.readScalar();
|
fSigma = buffer.readScalar();
|
||||||
#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO
|
#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO
|
||||||
// Fixing this must be done in two stages. When the skps are recaptured in V13,
|
// Fixing this must be done in two stages. When the skps are recaptured in V13,
|
||||||
// remove the ConvertRadiusToSigma but retain the absolute value.
|
// remove the ConvertRadiusToSigma but retain the absolute value.
|
||||||
// At the same time, switch the code in flatten to write a positive value.
|
// At the same time, switch the code in flatten to write a positive value.
|
||||||
// When the skps are captured in V14 the absolute value can be removed.
|
// When the skps are captured in V14 the absolute value can be removed.
|
||||||
if (fSigma > 0) {
|
if (fSigma > 0) {
|
||||||
|
|
|
@ -137,7 +137,7 @@ SkEmbossMaskFilter::SkEmbossMaskFilter(SkFlattenableReadBuffer& buffer)
|
||||||
fBlurSigma = buffer.readScalar();
|
fBlurSigma = buffer.readScalar();
|
||||||
#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO
|
#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO
|
||||||
// Fixing this must be done in two stages. When the skps are recaptured in V13,
|
// Fixing this must be done in two stages. When the skps are recaptured in V13,
|
||||||
// remove the ConvertRadiusToSigma but retain the absolute value.
|
// remove the ConvertRadiusToSigma but retain the absolute value.
|
||||||
// At the same time, switch the code in flatten to write a positive value.
|
// At the same time, switch the code in flatten to write a positive value.
|
||||||
// When the skps are captured in V14 the absolute value can be removed.
|
// When the skps are captured in V14 the absolute value can be removed.
|
||||||
if (fBlurSigma > 0) {
|
if (fBlurSigma > 0) {
|
||||||
|
|
|
@ -818,7 +818,7 @@ uint16_t SkScalerContext_GDI::generateCharToGlyph(SkUnichar utf32) {
|
||||||
// TODO(ctguil): Support characters that generate more than one glyph.
|
// TODO(ctguil): Support characters that generate more than one glyph.
|
||||||
if (SkUTF16_FromUnichar(utf32, (uint16_t*)utf16) == 1) {
|
if (SkUTF16_FromUnichar(utf32, (uint16_t*)utf16) == 1) {
|
||||||
// Type1 fonts fail with uniscribe API. Use GetGlyphIndices for plane 0.
|
// Type1 fonts fail with uniscribe API. Use GetGlyphIndices for plane 0.
|
||||||
|
|
||||||
/** Real documentation for GetGlyphIndiciesW:
|
/** Real documentation for GetGlyphIndiciesW:
|
||||||
*
|
*
|
||||||
* When GGI_MARK_NONEXISTING_GLYPHS is not specified and a character does not map to a
|
* When GGI_MARK_NONEXISTING_GLYPHS is not specified and a character does not map to a
|
||||||
|
|
Загрузка…
Ссылка в новой задаче