зеркало из https://github.com/mozilla/moz-skia.git
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7332 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
c9dc537293
Коммит
98ded84b80
|
@ -26,7 +26,7 @@ public:
|
|||
SkScalar k3, SkScalar k4);
|
||||
|
||||
private:
|
||||
typedef SkXfermode INHERITED;
|
||||
typedef SkXfermode INHERITED;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -456,7 +456,7 @@ static void S32_D32_constX_shaderproc(const SkBitmapProcState& s,
|
|||
SkIntToScalar(y) + SK_ScalarHalf,
|
||||
&pt);
|
||||
// When the matrix has a scale component the setup code in
|
||||
// chooseProcs multiples the inverse matrix by the inverse of the
|
||||
// chooseProcs multiples the inverse matrix by the inverse of the
|
||||
// bitmap's width and height. Since this method is going to do
|
||||
// its own tiling and sampling we need to undo that here.
|
||||
if (SkShader::kClamp_TileMode != s.fTileModeX ||
|
||||
|
|
|
@ -779,7 +779,7 @@ void SkProcCoeffXfermode::toString(SkString* str) const {
|
|||
str->append(gModeStrings[fMode]);
|
||||
|
||||
static const char* gCoeffStrings[kCoeffCount] = {
|
||||
"Zero", "One", "SC", "ISC", "DC", "IDC", "SA", "ISA", "DA", "IDA"
|
||||
"Zero", "One", "SC", "ISC", "DC", "IDC", "SA", "ISA", "DA", "IDA"
|
||||
};
|
||||
|
||||
str->append(" src: ");
|
||||
|
|
|
@ -28,7 +28,7 @@ public:
|
|||
private:
|
||||
SkScalar fK[4];
|
||||
|
||||
typedef SkXfermode INHERITED;
|
||||
typedef SkXfermode INHERITED;
|
||||
};
|
||||
|
||||
static int pinToByte(int value) {
|
||||
|
|
|
@ -950,7 +950,7 @@ void GrContext::drawOval(const GrPaint& paint,
|
|||
path.addOval(oval);
|
||||
this->drawPath(paint, path, stroke);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
internalDrawOval(paint, oval, stroke);
|
||||
}
|
||||
|
@ -960,10 +960,10 @@ bool GrContext::canDrawOval(const GrPaint& paint, const GrRect& oval, const SkSt
|
|||
if (!paint.isAntiAlias()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// we can draw circles in any style
|
||||
bool isCircle = SkScalarNearlyEqual(oval.width(), oval.height())
|
||||
&& circleStaysCircle(this->getMatrix());
|
||||
bool isCircle = SkScalarNearlyEqual(oval.width(), oval.height())
|
||||
&& circleStaysCircle(this->getMatrix());
|
||||
// and for now, axis-aligned ellipses only with fill or stroke-and-fill
|
||||
SkStrokeRec::Style style = stroke.getStyle();
|
||||
bool isStroke = (style == SkStrokeRec::kStroke_Style || style == SkStrokeRec::kHairline_Style);
|
||||
|
@ -978,11 +978,11 @@ void GrContext::internalDrawOval(const GrPaint& paint,
|
|||
|
||||
SkScalar xRadius = SkScalarHalf(oval.width());
|
||||
SkScalar yRadius = SkScalarHalf(oval.height());
|
||||
|
||||
|
||||
SkScalar strokeWidth = stroke.getWidth();
|
||||
SkStrokeRec::Style style = stroke.getStyle();
|
||||
|
||||
bool isCircle = SkScalarNearlyEqual(xRadius, yRadius) && circleStaysCircle(this->getMatrix());
|
||||
bool isCircle = SkScalarNearlyEqual(xRadius, yRadius) && circleStaysCircle(this->getMatrix());
|
||||
#ifdef SK_DEBUG
|
||||
{
|
||||
// we should have checked for this previously
|
||||
|
@ -1080,7 +1080,7 @@ void GrContext::internalDrawOval(const GrPaint& paint,
|
|||
}
|
||||
|
||||
SkScalar ratio = SkScalarDiv(xRadius, yRadius);
|
||||
|
||||
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
verts[i].fCenter = center;
|
||||
verts[i].fOuterRadius = xRadius;
|
||||
|
|
Загрузка…
Ссылка в новой задаче