Sanitizing source files in Skia_Periodic_House_Keeping

git-svn-id: http://skia.googlecode.com/svn/trunk@6746 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2012-12-11 02:01:20 +00:00
Родитель 41e850f074
Коммит c7b4be7f11
5 изменённых файлов: 15 добавлений и 15 удалений

Просмотреть файл

@ -794,7 +794,7 @@ struct Bounds : public SkRect {
void add(const Bounds& toAdd) { void add(const Bounds& toAdd) {
add(toAdd.fLeft, toAdd.fTop, toAdd.fRight, toAdd.fBottom); add(toAdd.fLeft, toAdd.fTop, toAdd.fRight, toAdd.fBottom);
} }
bool isEmpty() { bool isEmpty() {
return fLeft > fRight || fTop > fBottom return fLeft > fRight || fTop > fBottom
|| (fLeft == fRight && fTop == fBottom) || (fLeft == fRight && fTop == fBottom)
@ -1104,7 +1104,7 @@ public:
return activeOp(xorMiMask, xorSuMask, index, endIndex, op, sumMiWinding, sumSuWinding, return activeOp(xorMiMask, xorSuMask, index, endIndex, op, sumMiWinding, sumSuWinding,
maxWinding, sumWinding, oppMaxWinding, oppSumWinding); maxWinding, sumWinding, oppMaxWinding, oppSumWinding);
} }
bool activeOp(int xorMiMask, int xorSuMask, int index, int endIndex, ShapeOp op, bool activeOp(int xorMiMask, int xorSuMask, int index, int endIndex, ShapeOp op,
int& sumMiWinding, int& sumSuWinding, int& sumMiWinding, int& sumSuWinding,
int& maxWinding, int& sumWinding, int& oppMaxWinding, int& oppSumWinding) { int& maxWinding, int& sumWinding, int& oppMaxWinding, int& oppSumWinding) {
@ -1918,11 +1918,11 @@ public:
} }
return false; return false;
} }
// OPTIMIZE // OPTIMIZE
// when the edges are initially walked, they don't automatically get the prior and next // when the edges are initially walked, they don't automatically get the prior and next
// edges assigned to positions t=0 and t=1. Doing that would remove the need for this check, // edges assigned to positions t=0 and t=1. Doing that would remove the need for this check,
// and would additionally remove the need for similar checks in condition edges. It would // and would additionally remove the need for similar checks in condition edges. It would
// also allow intersection code to assume end of segment intersections (maybe?) // also allow intersection code to assume end of segment intersections (maybe?)
bool complete() const { bool complete() const {
int count = fTs.count(); int count = fTs.count();
@ -2589,7 +2589,7 @@ public:
} }
} }
} }
void init(const SkPoint pts[], SkPath::Verb verb, bool operand, bool evenOdd) { void init(const SkPoint pts[], SkPath::Verb verb, bool operand, bool evenOdd) {
fDoneSpans = 0; fDoneSpans = 0;
fOperand = operand; fOperand = operand;
@ -2724,7 +2724,7 @@ public:
Span* markAndChaseWinding(const Angle* angle, const int winding) { Span* markAndChaseWinding(const Angle* angle, const int winding) {
int index = angle->start(); int index = angle->start();
int endIndex = angle->end(); int endIndex = angle->end();
int step = SkSign32(endIndex - index); int step = SkSign32(endIndex - index);
int min = SkMin32(index, endIndex); int min = SkMin32(index, endIndex);
markWinding(min, winding); markWinding(min, winding);
Span* last; Span* last;
@ -3172,7 +3172,7 @@ public:
*outsideTs.append() = start; *outsideTs.append() = start;
} }
} }
void undoneSpan(int& start, int& end) { void undoneSpan(int& start, int& end) {
size_t tCount = fTs.count(); size_t tCount = fTs.count();
size_t index; size_t index;
@ -3930,7 +3930,7 @@ public:
void setOperand(bool isOp) { void setOperand(bool isOp) {
fOperand = isOp; fOperand = isOp;
} }
void setOppXor(bool isOppXor) { void setOppXor(bool isOppXor) {
fOppXor = isOppXor; fOppXor = isOppXor;
int segmentCount = fSegments.count(); int segmentCount = fSegments.count();

Просмотреть файл

@ -56,7 +56,7 @@ public:
/** Returns a GrPathRenderer compatible with the request if one is available. If the caller /** Returns a GrPathRenderer compatible with the request if one is available. If the caller
is drawing the path to the stencil buffer then stencilSupport can be used to determine is drawing the path to the stencil buffer then stencilSupport can be used to determine
whether the path can be rendered with arbitrary stencil rules or not. See comments on whether the path can be rendered with arbitrary stencil rules or not. See comments on
StencilSupport in GrPathRenderer.h. */ StencilSupport in GrPathRenderer.h. */
GrPathRenderer* getPathRenderer(const SkPath& path, GrPathRenderer* getPathRenderer(const SkPath& path,
const SkStroke& stroke, const SkStroke& stroke,
const GrDrawTarget* target, const GrDrawTarget* target,

Просмотреть файл

@ -40,7 +40,7 @@ protected:
GrDrawTarget*, GrDrawTarget*,
bool antiAlias) SK_OVERRIDE; bool antiAlias) SK_OVERRIDE;
virtual void onStencilPath(const SkPath&, virtual void onStencilPath(const SkPath&,
const SkStroke&, const SkStroke&,
GrDrawTarget*) SK_OVERRIDE; GrDrawTarget*) SK_OVERRIDE;

Просмотреть файл

@ -100,7 +100,7 @@ static void test_constructor(skiatest::Reporter* reporter) {
// Verify that kIdentity_Constructor really does initialize to an identity matrix. // Verify that kIdentity_Constructor really does initialize to an identity matrix.
testMatrix = 0; testMatrix = 0;
testMatrix = new(placeholderMatrix) SkMatrix44(SkMatrix44::kIdentity_Constructor); testMatrix = new(placeholderMatrix) SkMatrix44(SkMatrix44::kIdentity_Constructor);
REPORTER_ASSERT(reporter, testMatrix == placeholderMatrix); REPORTER_ASSERT(reporter, testMatrix == placeholderMatrix);
REPORTER_ASSERT(reporter, testMatrix->isIdentity()); REPORTER_ASSERT(reporter, testMatrix->isIdentity());
REPORTER_ASSERT(reporter, *testMatrix == SkMatrix44::I()); REPORTER_ASSERT(reporter, *testMatrix == SkMatrix44::I());

Просмотреть файл

@ -669,10 +669,10 @@ public:
SkIntToScalar(fPicture->height())); SkIntToScalar(fPicture->height()));
SkData* data = SkPictureUtils::GatherPixelRefs(fPicture, bounds); SkData* data = SkPictureUtils::GatherPixelRefs(fPicture, bounds);
SkSafeUnref(data); SkSafeUnref(data);
return NULL == path; // we don't have anything to write return NULL == path; // we don't have anything to write
} }
private: private:
virtual SkString getConfigNameInternal() SK_OVERRIDE { virtual SkString getConfigNameInternal() SK_OVERRIDE {
return SkString("gather_pixelrefs"); return SkString("gather_pixelrefs");
@ -692,10 +692,10 @@ public:
SkPicture* clone = fPicture->clone(); SkPicture* clone = fPicture->clone();
SkSafeUnref(clone); SkSafeUnref(clone);
} }
return NULL == path; // we don't have anything to write return NULL == path; // we don't have anything to write
} }
private: private:
virtual SkString getConfigNameInternal() SK_OVERRIDE { virtual SkString getConfigNameInternal() SK_OVERRIDE {
return SkString("picture_clone"); return SkString("picture_clone");