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

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@5989 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2012-10-18 02:01:23 +00:00
parent ee0b693532
commit 989a95ea77
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bench/PathBench.cpp
View File

@ -671,7 +671,7 @@ private:
typedef SkBenchmark INHERITED;
};
// Chrome creates its own round rects with each corner possibly being different
// Chrome creates its own round rects with each corner possibly being different
class ArbRoundRectBench : public SkBenchmark {
protected:
SkString fName;
@ -689,8 +689,8 @@ protected:
return fName.c_str();
}
static void add_corner_arc(SkPath* path, const SkRect& rect,
SkScalar xIn, SkScalar yIn,
static void add_corner_arc(SkPath* path, const SkRect& rect,
SkScalar xIn, SkScalar yIn,
int startAngle)
{
@ -719,7 +719,7 @@ protected:
path->arcTo(arcRect, SkIntToScalar(startAngle), SkIntToScalar(90), false);
}
static void make_arb_round_rect(SkPath* path, const SkRect& r,
static void make_arb_round_rect(SkPath* path, const SkRect& r,
SkScalar xCorner, SkScalar yCorner) {
// we are lazy here and use the same x & y for each corner
add_corner_arc(path, r, xCorner, yCorner, 270);

2
include/gpu/GrSamplerState.h
View File

@ -63,7 +63,7 @@ public:
/**
* This is called when the coordinate system in which the geometry is specified will change.
*
* @param matrix The transformation from the old coord system to the new one.
* @param matrix The transformation from the old coord system to the new one.
*/
void preConcatCoordChange(const GrMatrix& matrix) { fCoordChangeMatrix.preConcat(matrix); }

6
src/core/SkBitmapProcState.cpp
View File

@ -63,7 +63,7 @@ static bool just_trans_general(const SkMatrix& matrix) {
}
if (mask & SkMatrix::kScale_Mask) {
const SkScalar tol = SK_Scalar1 / 32768;
if (!SkScalarNearlyZero(matrix[SkMatrix::kMScaleX] - SK_Scalar1, tol)) {
return false;
}
@ -106,7 +106,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
int shift = fOrigBitmap.extractMipLevel(&fMipBitmap,
SkScalarToFixed(m->getScaleX()),
SkScalarToFixed(m->getSkewY()));
if (shift > 0) {
if (m != &fUnitInvMatrix) {
fUnitInvMatrix = *m;
@ -137,7 +137,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
// Below this point, we should never refer to the inv parameter, since we
// may be using a munged version for "our" inverse.
fInvMatrix = m;
fInvProc = m->getMapXYProc();
fInvType = m->getType();

2
src/effects/SkColorMatrixFilter.cpp
View File

@ -371,7 +371,7 @@ public:
// could optimize this case, but we aren't for now.
inputColor = GrGLSLOnesVecf(4);
}
// The max() is to guard against 0 / 0 during unpremul when the incoming color is
// The max() is to guard against 0 / 0 during unpremul when the incoming color is
// transparent black.
builder->fFSCode.appendf("\tfloat nonZeroAlpha = max(%s.a, 0.00001);\n", inputColor);
builder->fFSCode.appendf("\t%s = %s * vec4(%s.rgb / nonZeroAlpha, nonZeroAlpha) + %s;\n",

8
tests/DeferredCanvasTest.cpp
View File

@ -369,7 +369,7 @@ static void TestDeferredCanvasBitmapShaderNoLeak(skiatest::Reporter* reporter) {
SkBitmap paintPattern;
paintPattern.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
paintPattern.allocPixels();
paint.setShader(SkNEW_ARGS(SkBitmapProcShader,
paint.setShader(SkNEW_ARGS(SkBitmapProcShader,
(paintPattern, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode)))->unref();
canvas.drawPaint(paint);
canvas.flush();
@ -382,13 +382,13 @@ static void TestDeferredCanvasBitmapShaderNoLeak(skiatest::Reporter* reporter) {
REPORTER_ASSERT(reporter, newBytesAllocated > bytesAllocated);
bytesAllocated = newBytesAllocated;
} else {
REPORTER_ASSERT(reporter, newBytesAllocated == bytesAllocated);
REPORTER_ASSERT(reporter, newBytesAllocated == bytesAllocated);
}
}
}
// All cached resources should be evictable since last canvas call was flush()
// All cached resources should be evictable since last canvas call was flush()
canvas.freeMemoryIfPossible(~0);
REPORTER_ASSERT(reporter, 0 == canvas.storageAllocatedForRecording());
REPORTER_ASSERT(reporter, 0 == canvas.storageAllocatedForRecording());
}
static void TestDeferredCanvas(skiatest::Reporter* reporter) {