Minor cleanup
https://codereview.appspot.com/6927054/
git-svn-id: http://skia.googlecode.com/svn/trunk@6756 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp
index a3ed886..b324cf2 100644
--- a/bench/DashBench.cpp
+++ b/bench/DashBench.cpp
@@ -262,7 +262,7 @@
class DrawPointsDashingBench : public SkBenchmark {
SkString fName;
int fStrokeWidth;
- bool fdoAA;
+ bool fDoAA;
SkAutoTUnref<SkPathEffect> fPathEffect;
@@ -275,7 +275,7 @@
: INHERITED(param) {
fName.printf("drawpointsdash_%d_%d%s", dashLength, strokeWidth, doAA ? "_aa" : "_bw");
fStrokeWidth = strokeWidth;
- fdoAA = doAA;
+ fDoAA = doAA;
SkScalar vals[] = { SkIntToScalar(dashLength), SkIntToScalar(dashLength) };
fPathEffect.reset(new SkDashPathEffect(vals, 2, SK_Scalar1, false));
@@ -294,7 +294,7 @@
p.setStyle(SkPaint::kStroke_Style);
p.setStrokeWidth(SkIntToScalar(fStrokeWidth));
p.setPathEffect(fPathEffect);
- p.setAntiAlias(fdoAA);
+ p.setAntiAlias(fDoAA);
SkPoint pts[2] = {
{ SkIntToScalar(10), 0 },
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 48e14e2..e445171 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -182,7 +182,7 @@
int fCurType;
int fCurCommand; // the current command being executed/timed
- virtual size_t preDraw(size_t offset, int type) SK_OVERRIDE {
+ virtual size_t preDraw(size_t offset, int type) {
// This search isn't as bad as it seems. In normal playback mode, the
// base class steps through the commands in order and can only skip ahead
// a bit on a clip. This class is only used during profiling so we
@@ -224,7 +224,7 @@
return 0;
}
- virtual void postDraw(size_t offset) SK_OVERRIDE {
+ virtual void postDraw(size_t offset) {
#if defined(SK_BUILD_FOR_WIN32)
// CPU timer doesn't work well on Windows
double time = fTimer.endWall();
@@ -903,7 +903,7 @@
protected:
SkTDArray<size_t> fOffsets;
- virtual size_t preDraw(size_t offset, int type) SK_OVERRIDE {
+ virtual size_t preDraw(size_t offset, int type) {
*fOffsets.append() = offset;
return 0;
}
diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp
index 4f04dd4..8c3d3a5 100644
--- a/gm/modecolorfilters.cpp
+++ b/gm/modecolorfilters.cpp
@@ -137,7 +137,8 @@
SkScalar x = SkIntToScalar(idx % kRectsPerRow);
SkScalar y = SkIntToScalar(idx / kRectsPerRow);
SkRect rect = SkRect::MakeXYWH(x * kRectWidth, y * kRectHeight,
- kRectWidth, kRectHeight);
+ SkIntToScalar(kRectWidth),
+ SkIntToScalar(kRectHeight));
canvas->drawRect(rect, bgPaint);
canvas->drawRect(rect, paint);
++idx;
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp
index ed9b33f..fa327c8 100644
--- a/gm/shadertext3.cpp
+++ b/gm/shadertext3.cpp
@@ -118,7 +118,7 @@
canvas->drawText(kText, kTextLen, 0, 0, fillPaint);
canvas->drawText(kText, kTextLen, 0, 0, outlinePaint);
- int w = fillPaint.measureText(kText, kTextLen);
+ SkScalar w = fillPaint.measureText(kText, kTextLen);
canvas->translate(w + 10.f, 0.f);
++i;
if (!(i % 2)) {
diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index 3641ec9..29fd865 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -55,7 +55,7 @@
fClipRect.set(2, 2, 11, 8 );
}
- int getZoom() const { return fZ; }
+ int getZoom() const { return fZoom; }
bool getAA() const { return fAA; }
void setAA(bool aa) { fAA = aa; }
@@ -82,7 +82,7 @@
void setWHZ(int width, int height, int zoom) {
fW = width;
fH = height;
- fZ = zoom;
+ fZoom = zoom;
fBounds.set(0, 0, SkIntToScalar(width * zoom), SkIntToScalar(height * zoom));
fMatrix.setScale(SkIntToScalar(zoom), SkIntToScalar(zoom));
fInverse.setScale(SK_Scalar1 / zoom, SK_Scalar1 / zoom);
@@ -105,7 +105,7 @@
private:
bool fAA, fGrid, fShowSkeleton, fUseGPU, fUseClip;
Style fStyle;
- int fW, fH, fZ;
+ int fW, fH, fZoom;
SkMatrix fMatrix, fInverse;
SkRect fBounds, fClipRect;
SkAutoTUnref<SkShader> fShader;
@@ -141,12 +141,12 @@
if (fUseGPU && fAA) {
SkRect rr = r;
- rr.inset(fZ/2, fZ/2);
+ rr.inset(SkIntToScalar(fZoom)/2, SkIntToScalar(fZoom)/2);
path.addRect(rr);
path.moveTo(rr.fLeft, rr.fTop);
path.lineTo(rr.fRight, rr.fBottom);
rr = r;
- rr.inset(-fZ/2, -fZ/2);
+ rr.inset(-SkIntToScalar(fZoom)/2, -SkIntToScalar(fZoom)/2);
path.addRect(rr);
} else {
path.addRect(r);
@@ -169,11 +169,11 @@
SkPaint paint;
paint.setXfermodeMode(SkXfermode::kClear_Mode);
for (int iy = 1; iy < fH; ++iy) {
- SkScalar y = SkIntToScalar(iy * fZ);
+ SkScalar y = SkIntToScalar(iy * fZoom);
canvas->drawLine(0, y - SK_ScalarHalf, 999, y - SK_ScalarHalf, paint);
}
for (int ix = 1; ix < fW; ++ix) {
- SkScalar x = SkIntToScalar(ix * fZ);
+ SkScalar x = SkIntToScalar(ix * fZoom);
canvas->drawLine(x - SK_ScalarHalf, 0, x - SK_ScalarHalf, 999, paint);
}
}
@@ -198,11 +198,11 @@
outer.setColor(SK_ColorWHITE);
outer.setStrokeWidth(PIXEL_CENTER_SIZE + 2);
- SkScalar half = SkIntToScalar(fZ) / 2;
+ SkScalar half = SkIntToScalar(fZoom) / 2;
for (int iy = 0; iy < fH; ++iy) {
- SkScalar y = SkIntToScalar(iy * fZ) + half;
+ SkScalar y = SkIntToScalar(iy * fZoom) + half;
for (int ix = 0; ix < fW; ++ix) {
- SkScalar x = SkIntToScalar(ix * fZ) + half;
+ SkScalar x = SkIntToScalar(ix * fZoom) + half;
canvas->drawPoint(x, y, outer);
canvas->drawPoint(x, y, inner);
@@ -214,10 +214,10 @@
p.setStyle(SkPaint::kStroke_Style);
p.setColor(SK_ColorLTGRAY);
SkRect r = {
- fClipRect.fLeft * fZ,
- fClipRect.fTop * fZ,
- fClipRect.fRight * fZ,
- fClipRect.fBottom * fZ
+ fClipRect.fLeft * fZoom,
+ fClipRect.fTop * fZoom,
+ fClipRect.fRight * fZoom,
+ fClipRect.fBottom * fZoom
};
canvas->drawRect(r, p);
}
@@ -236,7 +236,7 @@
if (fUseGPU) {
SkPaint p;
p.setStyle(SkPaint::kStroke_Style);
- p.setStrokeWidth(SK_Scalar1 * fZ);
+ p.setStrokeWidth(SK_Scalar1 * fZoom);
SkPath dst;
p.getFillPath(path, &dst);
path.addPath(dst);
@@ -245,7 +245,7 @@
case kStroke_Style: {
SkPaint p;
p.setStyle(SkPaint::kStroke_Style);
- p.setStrokeWidth(SK_Scalar1 * fZ);
+ p.setStrokeWidth(SK_Scalar1 * fZoom);
SkPath dst;
p.getFillPath(path, &dst);
path = dst;
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 595b575..c62eeb7 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -13,8 +13,7 @@
namespace {
-static GrVertexLayout aa_rect_layout(const GrDrawTarget* target,
- bool useCoverage) {
+static GrVertexLayout aa_rect_layout(bool useCoverage) {
GrVertexLayout layout = 0;
if (useCoverage) {
layout |= GrDrawTarget::kCoverage_VertexLayoutBit;
@@ -24,8 +23,8 @@
return layout;
}
-static void setInsetFan(GrPoint* pts, size_t stride,
- const GrRect& r, SkScalar dx, SkScalar dy) {
+static void set_inset_fan(GrPoint* pts, size_t stride,
+ const GrRect& r, SkScalar dx, SkScalar dy) {
pts->setRectFan(r.fLeft + dx, r.fTop + dy,
r.fRight - dx, r.fBottom - dy, stride);
}
@@ -106,7 +105,7 @@
GrDrawTarget* target,
const GrRect& devRect,
bool useVertexCoverage) {
- GrVertexLayout layout = aa_rect_layout(target, useVertexCoverage);
+ GrVertexLayout layout = aa_rect_layout(useVertexCoverage);
size_t vsize = GrDrawTarget::VertexSize(layout);
@@ -126,8 +125,8 @@
GrPoint* fan0Pos = reinterpret_cast<GrPoint*>(verts);
GrPoint* fan1Pos = reinterpret_cast<GrPoint*>(verts + 4 * vsize);
- setInsetFan(fan0Pos, vsize, devRect, -SK_ScalarHalf, -SK_ScalarHalf);
- setInsetFan(fan1Pos, vsize, devRect, SK_ScalarHalf, SK_ScalarHalf);
+ set_inset_fan(fan0Pos, vsize, devRect, -SK_ScalarHalf, -SK_ScalarHalf);
+ set_inset_fan(fan1Pos, vsize, devRect, SK_ScalarHalf, SK_ScalarHalf);
verts += sizeof(GrPoint);
for (int i = 0; i < 4; ++i) {
@@ -175,7 +174,7 @@
this->fillAARect(gpu, target, r, useVertexCoverage);
return;
}
- GrVertexLayout layout = aa_rect_layout(target, useVertexCoverage);
+ GrVertexLayout layout = aa_rect_layout(useVertexCoverage);
size_t vsize = GrDrawTarget::VertexSize(layout);
GrDrawTarget::AutoReleaseGeometry geo(target, layout, 16, 0);
@@ -199,14 +198,14 @@
GrPoint* fan2Pos = reinterpret_cast<GrPoint*>(verts + 8 * vsize);
GrPoint* fan3Pos = reinterpret_cast<GrPoint*>(verts + 12 * vsize);
- setInsetFan(fan0Pos, vsize, devRect,
- -rx - SK_ScalarHalf, -ry - SK_ScalarHalf);
- setInsetFan(fan1Pos, vsize, devRect,
- -rx + SK_ScalarHalf, -ry + SK_ScalarHalf);
- setInsetFan(fan2Pos, vsize, devRect,
- rx - SK_ScalarHalf, ry - SK_ScalarHalf);
- setInsetFan(fan3Pos, vsize, devRect,
- rx + SK_ScalarHalf, ry + SK_ScalarHalf);
+ set_inset_fan(fan0Pos, vsize, devRect,
+ -rx - SK_ScalarHalf, -ry - SK_ScalarHalf);
+ set_inset_fan(fan1Pos, vsize, devRect,
+ -rx + SK_ScalarHalf, -ry + SK_ScalarHalf);
+ set_inset_fan(fan2Pos, vsize, devRect,
+ rx - SK_ScalarHalf, ry - SK_ScalarHalf);
+ set_inset_fan(fan3Pos, vsize, devRect,
+ rx + SK_ScalarHalf, ry + SK_ScalarHalf);
// The outermost rect has 0 coverage
verts += sizeof(GrPoint);
diff --git a/tests/InfRectTest.cpp b/tests/InfRectTest.cpp
index ae4ea60..808bcee 100644
--- a/tests/InfRectTest.cpp
+++ b/tests/InfRectTest.cpp
@@ -41,8 +41,8 @@
rand.nextS() >> 2, rand.nextS() >> 2);
int cx = r.centerX();
int cy = r.centerY();
- REPORTER_ASSERT(reporter, (r.left() + r.right() >> 1) == cx);
- REPORTER_ASSERT(reporter, (r.top() + r.bottom() >> 1) == cy);
+ REPORTER_ASSERT(reporter, ((r.left() + r.right()) >> 1) == cx);
+ REPORTER_ASSERT(reporter, ((r.top() + r.bottom()) >> 1) == cy);
}
}