Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8350 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/debugger/SkDrawCommand.cpp b/debugger/SkDrawCommand.cpp
index 3645902..e85aab1 100644
--- a/debugger/SkDrawCommand.cpp
+++ b/debugger/SkDrawCommand.cpp
@@ -184,8 +184,8 @@
}
DrawBitmapMatrix::DrawBitmapMatrix(const SkBitmap& bitmap,
- const SkMatrix& matrix,
- const SkPaint* paint,
+ const SkMatrix& matrix,
+ const SkPaint* paint,
SkBitmap& resizedBitmap) {
fBitmap = bitmap;
fMatrix = matrix;
@@ -214,7 +214,7 @@
}
DrawBitmapNine::DrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
- const SkRect& dst, const SkPaint* paint,
+ const SkRect& dst, const SkPaint* paint,
SkBitmap& resizedBitmap) {
fBitmap = bitmap;
fCenter = center;
@@ -591,7 +591,7 @@
}
void SaveLayer::execute(SkCanvas* canvas) {
- canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
+ canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
fPaintPtr,
fFlags);
}
diff --git a/debugger/SkDrawCommand.h b/debugger/SkDrawCommand.h
index 086627a..6acc24f 100644
--- a/debugger/SkDrawCommand.h
+++ b/debugger/SkDrawCommand.h
@@ -177,7 +177,7 @@
class DrawBitmapNine : public SkDrawCommand {
public:
DrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
- const SkRect& dst, const SkPaint* paint,
+ const SkRect& dst, const SkPaint* paint,
SkBitmap& resizedBitmap);
virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual const SkBitmap* getBitmap() const SK_OVERRIDE;
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index bc969f5..4d328d1 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -891,7 +891,7 @@
/// draw state is left unmodified.
GrDrawTarget* prepareToDraw(const GrPaint*, BufferedDraw);
- void internalDrawPath(GrDrawTarget* target, const GrPaint& paint, const SkPath& path,
+ void internalDrawPath(GrDrawTarget* target, const GrPaint& paint, const SkPath& path,
const SkStrokeRec& stroke);
GrTexture* createResizedTexture(const GrTextureDesc& desc,
diff --git a/include/gpu/GrOvalRenderer.h b/include/gpu/GrOvalRenderer.h
index bdc4861..88dd0a4 100644
--- a/include/gpu/GrOvalRenderer.h
+++ b/include/gpu/GrOvalRenderer.h
@@ -30,7 +30,7 @@
~GrOvalRenderer() {}
- bool drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
+ bool drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
const GrRect& oval, const SkStrokeRec& stroke);
private:
void drawEllipse(GrDrawTarget* target, const GrPaint& paint,
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index eee3307..e2c41d1 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1026,7 +1026,7 @@
SkRect ovalRect;
bool isOval = path.isOval(&ovalRect);
- if (!isOval || path.isInverseFillType()
+ if (!isOval || path.isInverseFillType()
|| !fOvalRenderer->drawOval(target, this, paint, ovalRect, stroke)) {
this->internalDrawPath(target, paint, path, stroke);
}
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 4847e0e..2d25d54 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -40,7 +40,7 @@
}
-bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
+bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
const GrRect& oval, const SkStrokeRec& stroke)
{
if (!paint.isAntiAlias()) {
@@ -49,8 +49,8 @@
const SkMatrix& vm = context->getMatrix();
- // we can draw circles
- if (SkScalarNearlyEqual(oval.width(), oval.height())
+ // we can draw circles
+ if (SkScalarNearlyEqual(oval.width(), oval.height())
&& circle_stays_circle(vm)) {
drawCircle(target, paint, oval, stroke);
@@ -65,7 +65,7 @@
return true;
}
-void GrOvalRenderer::drawCircle(GrDrawTarget* target,
+void GrOvalRenderer::drawCircle(GrDrawTarget* target,
const GrPaint& paint,
const GrRect& circle,
const SkStrokeRec& stroke)
@@ -109,7 +109,7 @@
kEdgeEffectStage = GrPaint::kTotalStages,
};
drawState->setAttribBindings(GrDrawState::kDefault_AttribBindings);
-
+
GrEffectRef* effect = GrCircleEdgeEffect::Create(isStroked);
static const int kCircleEdgeAttrIndex = 1;
drawState->setEffect(kEdgeEffectStage, effect, kCircleEdgeAttrIndex)->unref();
@@ -156,7 +156,7 @@
target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4);
}
-void GrOvalRenderer::drawEllipse(GrDrawTarget* target,
+void GrOvalRenderer::drawEllipse(GrDrawTarget* target,
const GrPaint& paint,
const GrRect& ellipse,
const SkStrokeRec& stroke)
@@ -275,4 +275,3 @@
target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4);
}
-