Style bikeshed - remove extraneous whitespace
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842753002
Review URL: https://codereview.chromium.org/1842753002
diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp
index fae6109..1cb7157 100644
--- a/gm/aaclip.cpp
+++ b/gm/aaclip.cpp
@@ -206,7 +206,7 @@
ClipCubicGM() {
fVPath.moveTo(W, 0);
fVPath.cubicTo(W, H-10, 0, 10, 0, H);
-
+
SkMatrix pivot;
pivot.setRotate(90, W/2, H/2);
fVPath.transform(pivot, &fHPath);
@@ -216,7 +216,7 @@
SkString onShortName() override {
return SkString("clipcubic");
}
-
+
SkISize onISize() override {
return SkISize::Make(400, 410);
}
@@ -224,10 +224,10 @@
void doDraw(SkCanvas* canvas, const SkPath& path) {
SkPaint paint;
paint.setAntiAlias(true);
-
+
paint.setColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
canvas->drawPath(path, paint);
-
+
paint.setColor(SK_ColorRED);
paint.setStyle(SkPaint::kStroke_Style);
canvas->drawPath(path, paint);
@@ -242,7 +242,7 @@
canvas->drawRect(r, paint);
this->doDraw(canvas, path);
-
+
canvas->translate(dx, dy);
canvas->drawRect(r, paint);
@@ -256,7 +256,7 @@
canvas->translate(0, 200);
this->drawAndClip(canvas, fHPath, 200, 0);
}
-
+
private:
typedef skiagm::GM INHERITED;
};
diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp
index 14073df..f1264db 100644
--- a/gm/aaxfermodes.cpp
+++ b/gm/aaxfermodes.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2015 Google Inc.
*
@@ -113,8 +112,8 @@
kLabelSpacing + kShapeTypeSpacing * 1.5f + kShapeSpacing / 2,
kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3, fLabelPaint);
canvas->drawText("Src Opaque", sizeof("Src Opaque") - 1,
- kLabelSpacing + kShapeTypeSpacing * 1.5f + kShapeSpacing / 2 +
- kPaintSpacing, kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3,
+ kLabelSpacing + kShapeTypeSpacing * 1.5f + kShapeSpacing / 2 +
+ kPaintSpacing, kSubtitleSpacing / 2 + fLabelPaint.getTextSize() / 3,
fLabelPaint);
}
diff --git a/gm/addarc.cpp b/gm/addarc.cpp
index 0d1ea93..9280140 100644
--- a/gm/addarc.cpp
+++ b/gm/addarc.cpp
@@ -120,12 +120,12 @@
class StrokeCircleGM : public skiagm::GM {
public:
StrokeCircleGM() : fRotate(0) {}
-
+
protected:
SkString onShortName() override { return SkString("strokecircle"); }
-
+
SkISize onISize() override { return SkISize::Make(520, 520); }
-
+
void onDraw(SkCanvas* canvas) override {
canvas->scale(20, 20);
canvas->translate(13, 13);
@@ -176,12 +176,12 @@
class ManyArcsGM : public skiagm::GM {
public:
ManyArcsGM() {}
-
+
protected:
SkString onShortName() override { return SkString("manyarcs"); }
-
+
SkISize onISize() override { return SkISize::Make(620, 330); }
-
+
void onDraw(SkCanvas* canvas) override {
SkPaint paint;
paint.setAntiAlias(true);
@@ -197,12 +197,12 @@
for (size_t i = 0; i < SK_ARRAY_COUNT(sweepAngles); ++i) {
sweepAngles[i] *= 180;
}
-
+
SkScalar startAngles[] = { -1, -0.5f, 0, 0.5f };
for (size_t i = 0; i < SK_ARRAY_COUNT(startAngles); ++i) {
startAngles[i] *= 180;
}
-
+
bool anticlockwise = false;
SkScalar sign = 1;
for (size_t i = 0; i < SK_ARRAY_COUNT(startAngles) * 2; ++i) {
@@ -225,9 +225,8 @@
canvas->translate(0, 40);
}
}
-
+
private:
typedef skiagm::GM INHERITED;
};
DEF_GM( return new ManyArcsGM; )
-
diff --git a/gm/anisotropic.cpp b/gm/anisotropic.cpp
index 6610926..3e573c4 100644
--- a/gm/anisotropic.cpp
+++ b/gm/anisotropic.cpp
@@ -60,7 +60,7 @@
void onDraw(SkCanvas* canvas) override {
SkScalar gScales[] = { 0.9f, 0.8f, 0.75f, 0.6f, 0.5f, 0.4f, 0.25f, 0.2f, 0.1f };
-
+
SkASSERT(kNumVertImages-1 == (int)SK_ARRAY_COUNT(gScales)/2);
// Minimize vertically
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 5d26be8..f609ba8 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp
index 3a7a155..f24d072 100644
--- a/gm/bigrrectaaeffect.cpp
+++ b/gm/bigrrectaaeffect.cpp
@@ -74,7 +74,7 @@
for (size_t et = 0; et < SK_ARRAY_COUNT(kEdgeTypes); ++et) {
GrPrimitiveEdgeType edgeType = kEdgeTypes[et];
canvas->save();
- canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
+ canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
// Draw a background for the test case
SkPaint paint;
diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp
index ac43db5..b52337b 100644
--- a/gm/bitmapcopy.cpp
+++ b/gm/bitmapcopy.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
@@ -78,7 +77,7 @@
canvas->clear(sk_tool_utils::color_to_565(0xFFDDDDDD));
paint.setAntiAlias(true);
sk_tool_utils::set_portable_typeface(&paint);
-
+
SkScalar width = SkIntToScalar(40);
SkScalar height = SkIntToScalar(40);
if (paint.getFontSpacing() > height) {
diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index b727328..2cded98 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -131,19 +131,19 @@
fBitmap.extractAlpha(&fAlpha);
}
-
+
public:
SkBitmap fBitmap, fAlpha;
-
+
protected:
SkString onShortName() override {
return SkString("extractalpha");
}
-
+
SkISize onISize() override {
return SkISize::Make(540, 330);
}
-
+
void onDraw(SkCanvas* canvas) override {
SkPaint paint;
paint.setAntiAlias(true);
@@ -153,9 +153,8 @@
canvas->drawBitmap(fBitmap, 10, 10, &paint); // should stay blue (ignore paint's color)
canvas->drawBitmap(fAlpha, 120, 10, &paint); // should draw red
}
-
+
private:
typedef skiagm::GM INHERITED;
};
DEF_GM( return new TestExtractAlphaGM; )
-
diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index bf06adb..4853d03 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -281,4 +281,3 @@
DEF_GM( return new DrawBitmapRect4(false); )
DEF_GM( return new DrawBitmapRect4(true); )
#endif
-
diff --git a/gm/bitmapshader.cpp b/gm/bitmapshader.cpp
index 491905a..84d0b55 100644
--- a/gm/bitmapshader.cpp
+++ b/gm/bitmapshader.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/gm/bleed.cpp b/gm/bleed.cpp
index c3d026a..bd1a282 100644
--- a/gm/bleed.cpp
+++ b/gm/bleed.cpp
@@ -156,7 +156,7 @@
/** Similar to make_ringed_bitmap with these modifications:
- The backing store is a texture.
- - The texture is larger than the bitmap dimensions (it is surrounded by non-content
+ - The texture is larger than the bitmap dimensions (it is surrounded by non-content
padding on the right/bottom of the contents.)
- The right/bottom sides of the rings are omitted so that the rect to draw is adjacent to
the texture padding.
diff --git a/gm/bmpfilterqualityrepeat.cpp b/gm/bmpfilterqualityrepeat.cpp
index b32a99a..6264d74 100644
--- a/gm/bmpfilterqualityrepeat.cpp
+++ b/gm/bmpfilterqualityrepeat.cpp
@@ -39,7 +39,7 @@
void onDraw(SkCanvas* canvas) override {
- static const struct {
+ static const struct {
SkFilterQuality fQuality;
const char* fName;
} kQualities[] = {
diff --git a/gm/circles.cpp b/gm/circles.cpp
index d9b25c0..dd37a61 100644
--- a/gm/circles.cpp
+++ b/gm/circles.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2012 Intel Inc.
*
@@ -155,7 +154,7 @@
giantPaint.setAntiAlias(true);
giantPaint.setColor(0x80808080);
canvas->drawCircle(giantCenter.fX, giantCenter.fY, giantRadius, giantPaint);
-
+
SkRandom rand;
canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
int i;
diff --git a/gm/circularclips.cpp b/gm/circularclips.cpp
index 15f583f..2691971 100644
--- a/gm/circularclips.cpp
+++ b/gm/circularclips.cpp
@@ -60,7 +60,7 @@
canvas->drawRect(rect, fillPaint);
canvas->restore();
-
+
fillPaint.setColor(0xFF000000);
for (size_t i = 0; i < 4; i++) {
diff --git a/gm/color4f.cpp b/gm/color4f.cpp
index 7704dee..2585ad8 100644
--- a/gm/color4f.cpp
+++ b/gm/color4f.cpp
@@ -53,7 +53,7 @@
const SkRect r = SkRect::MakeWH(50, 100);
sk_sp<SkShader> (*shaders[])() { make_opaque_color, make_alpha_color };
sk_sp<SkColorFilter> (*filters[])() { make_cf_null, make_cf0, make_cf1, make_cf2 };
-
+
SkPaint paint;
for (auto shProc : shaders) {
paint.setShader(shProc());
diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp
index 8ac15db..202f72a 100644
--- a/gm/colormatrix.cpp
+++ b/gm/colormatrix.cpp
@@ -35,7 +35,7 @@
SkISize onISize() override {
return SkISize::Make(WIDTH, HEIGHT);
}
-
+
void onOnceBeforeDraw() override {
fSolidImg = CreateSolidBitmap(64, 64);
fTransparentImg = CreateTransparentBitmap(64, 64);
@@ -145,4 +145,3 @@
typedef skiagm::GM INHERITED;
};
DEF_GM( return new ColorMatrixGM; )
-
diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp
index bcbd7fd..7708efe 100644
--- a/gm/complexclip.cpp
+++ b/gm/complexclip.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp
index ae07d8e..67916ca 100644
--- a/gm/complexclip3.cpp
+++ b/gm/complexclip3.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2014 Google Inc.
*
@@ -26,7 +25,7 @@
SkString str;
str.printf("complexclip3_%s", fDoSimpleClipFirst ? "simple" : "complex");
return str;
- }
+ }
SkISize onISize() { return SkISize::Make(1000, 950); }
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp
index c43b443..421641c 100644
--- a/gm/composeshader.cpp
+++ b/gm/composeshader.cpp
@@ -204,7 +204,7 @@
canvas->translate(0, r.height() + 5);
}
}
-
+
private:
/** This determines the length and width of the bitmaps used in the ComposeShaders. Values
* above 20 may cause an SkASSERT to fail in SkSmallAllocator. However, larger values will
diff --git a/gm/conicpaths.cpp b/gm/conicpaths.cpp
index 91c337f..9e4e9ce 100644
--- a/gm/conicpaths.cpp
+++ b/gm/conicpaths.cpp
@@ -120,7 +120,7 @@
}
canvas->restore();
- this->drawGiantCircle(canvas);
+ this->drawGiantCircle(canvas);
}
private:
diff --git a/gm/convex_all_line_paths.cpp b/gm/convex_all_line_paths.cpp
index 3eae959..eb4bdcf 100644
--- a/gm/convex_all_line_paths.cpp
+++ b/gm/convex_all_line_paths.cpp
@@ -28,7 +28,7 @@
// paths
class ConvexLineOnlyPathsGM : public GM {
public:
- ConvexLineOnlyPathsGM() {
+ ConvexLineOnlyPathsGM() {
this->setBGColor(0xFFFFFFFF);
}
@@ -284,7 +284,7 @@
void onDraw(SkCanvas* canvas) override {
// the right edge of the last drawn path
- SkPoint offset = { 0, SkScalarHalf(kMaxPathHeight) };
+ SkPoint offset = { 0, SkScalarHalf(kMaxPathHeight) };
for (int i = 0; i < kNumPaths; ++i) {
this->drawPath(canvas, i, &offset);
diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp
index 4180884..50939f9 100644
--- a/gm/convexpaths.cpp
+++ b/gm/convexpaths.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp
index ff83a26..0c8e291 100644
--- a/gm/convexpolyclip.cpp
+++ b/gm/convexpolyclip.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2014 Google Inc.
*
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 412e478..aec571b 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2014 Google Inc.
*
diff --git a/gm/dashing.cpp b/gm/dashing.cpp
index 6cb1dea..95fc15a 100644
--- a/gm/dashing.cpp
+++ b/gm/dashing.cpp
@@ -12,7 +12,7 @@
static void drawline(SkCanvas* canvas, int on, int off, const SkPaint& paint,
SkScalar finalX = SkIntToScalar(600), SkScalar finalY = SkIntToScalar(0),
- SkScalar phase = SkIntToScalar(0),
+ SkScalar phase = SkIntToScalar(0),
SkScalar startX = SkIntToScalar(0), SkScalar startY = SkIntToScalar(0)) {
SkPaint p(paint);
@@ -453,8 +453,8 @@
paint.setStrokeWidth(SkIntToScalar(phase+1));
paint.setColor(gColors[phase]);
sign = (x % 20) ? 1 : -1;
- drawline(canvas, kOn, kOff, paint,
- SkIntToScalar(x), -sign * SkIntToScalar(10003),
+ drawline(canvas, kOn, kOff, paint,
+ SkIntToScalar(x), -sign * SkIntToScalar(10003),
SkIntToScalar(phase),
SkIntToScalar(x), sign * SkIntToScalar(10003));
phase = (phase + 1) % kIntervalLength;
@@ -464,8 +464,8 @@
paint.setStrokeWidth(SkIntToScalar(phase+1));
paint.setColor(gColors[phase]);
sign = (y % 20) ? 1 : -1;
- drawline(canvas, kOn, kOff, paint,
- -sign * SkIntToScalar(10003), SkIntToScalar(y),
+ drawline(canvas, kOn, kOff, paint,
+ -sign * SkIntToScalar(10003), SkIntToScalar(y),
SkIntToScalar(phase),
sign * SkIntToScalar(10003), SkIntToScalar(y));
phase = (phase + 1) % kIntervalLength;
diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp
index ed2b058..487f767 100644
--- a/gm/dcshader.cpp
+++ b/gm/dcshader.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2014 Google Inc.
*
diff --git a/gm/distantclip.cpp b/gm/distantclip.cpp
index fd96564..9276dad 100644
--- a/gm/distantclip.cpp
+++ b/gm/distantclip.cpp
@@ -1,5 +1,4 @@
-
/*
* Copyright 2012 Google Inc.
*
@@ -46,8 +45,8 @@
sk_sp<SkPicture> pict(recorder.finishRecordingAsPicture());
// Next we play that picture into another picture of the same size.
- pict->playback(recorder.beginRecording(pict->cullRect().width(),
- pict->cullRect().height(),
+ pict->playback(recorder.beginRecording(pict->cullRect().width(),
+ pict->cullRect().height(),
nullptr, 0));
sk_sp<SkPicture> pict2(recorder.finishRecordingAsPicture());
diff --git a/gm/drawatlas.cpp b/gm/drawatlas.cpp
index 334aba7..a906cbe 100644
--- a/gm/drawatlas.cpp
+++ b/gm/drawatlas.cpp
@@ -39,17 +39,17 @@
public:
DrawAtlasGM() {}
-
+
protected:
-
+
SkString onShortName() override {
return SkString("draw-atlas");
}
-
+
SkISize onISize() override {
return SkISize::Make(640, 480);
}
-
+
void onDraw(SkCanvas* canvas) override {
const SkRect target = { 50, 50, 80, 90 };
if (nullptr == fAtlas) {
@@ -61,7 +61,7 @@
SkScalar fDegrees;
SkScalar fTx;
SkScalar fTy;
-
+
void apply(SkRSXform* xform) const {
const SkScalar rad = SkDegreesToRadians(fDegrees);
xform->fSCos = fScale * SkScalarCos(rad);
@@ -95,9 +95,8 @@
canvas->translate(0, 100);
canvas->drawAtlas(fAtlas.get(), xform, tex, colors, N, SkXfermode::kSrcIn_Mode, nullptr, &paint);
}
-
+
private:
typedef GM INHERITED;
};
DEF_GM( return new DrawAtlasGM; )
-
diff --git a/gm/drawatlascolor.cpp b/gm/drawatlascolor.cpp
index e8fd236..0e85055 100644
--- a/gm/drawatlascolor.cpp
+++ b/gm/drawatlascolor.cpp
@@ -29,22 +29,22 @@
paint.setXfermode(SkXfermode::Create(SkXfermode::kSrc_Mode));
paint.setColor(SK_ColorWHITE);
- SkRect r = SkRect::MakeXYWH(0, 0,
+ SkRect r = SkRect::MakeXYWH(0, 0,
SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
canvas->drawRect(r, paint);
paint.setColor(SK_ColorRED);
- r = SkRect::MakeXYWH(SkIntToScalar(kBlockSize), 0,
+ r = SkRect::MakeXYWH(SkIntToScalar(kBlockSize), 0,
SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
canvas->drawRect(r, paint);
paint.setColor(SK_ColorGREEN);
- r = SkRect::MakeXYWH(0, SkIntToScalar(kBlockSize),
+ r = SkRect::MakeXYWH(0, SkIntToScalar(kBlockSize),
SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
canvas->drawRect(r, paint);
paint.setColor(SK_ColorTRANSPARENT);
- r = SkRect::MakeXYWH(SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize),
+ r = SkRect::MakeXYWH(SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize),
SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
canvas->drawRect(r, paint);
@@ -58,17 +58,17 @@
DrawAtlasColorsGM() {
this->setBGColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
}
-
+
protected:
SkString onShortName() override {
return SkString("draw-atlas-colors");
}
-
+
SkISize onISize() override {
return SkISize::Make(kNumXferModes * (kAtlasSize + kPad) + kPad,
2 * kNumColors * (kAtlasSize + kPad) + kTextPad + kPad);
}
-
+
void onDraw(SkCanvas* canvas) override {
const SkRect target = SkRect::MakeWH(SkIntToScalar(kAtlasSize), SkIntToScalar(kAtlasSize));
@@ -147,7 +147,7 @@
}
for (int i = 0; i < numModes; ++i) {
- canvas->save();
+ canvas->save();
canvas->translate(SkIntToScalar(i*(target.height()+kPad)),
SkIntToScalar(kTextPad+kPad));
// w/o a paint
@@ -157,10 +157,10 @@
// w a paint
canvas->drawAtlas(fAtlas.get(), xforms, rects, quadColors, numColors,
gModes[i].fMode, nullptr, &paint);
- canvas->restore();
+ canvas->restore();
}
}
-
+
private:
static const int kNumXferModes = 29;
static const int kNumColors = 4;
@@ -174,4 +174,3 @@
typedef GM INHERITED;
};
DEF_GM( return new DrawAtlasColorsGM; )
-
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 883e81b..7d83047 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -35,7 +35,7 @@
static sk_sp<SkImage> makebm(SkCanvas* origCanvas, SkBitmap* resultBM, int w, int h) {
SkImageInfo info = SkImageInfo::MakeN32Premul(w, h);
-
+
auto surface(origCanvas->makeSurface(info));
if (nullptr == surface) {
// picture canvas will return null, so fall-back to raster
@@ -88,7 +88,7 @@
#if SK_SUPPORT_GPU
if (GrTexture* texture = as_IB(image)->peekTexture()) {
GrWrapTextureInBitmap(texture, image->width(), image->height(), image->isOpaque(), &tempBM);
- } else
+ } else
#endif
{
image->asLegacyBitmap(&tempBM, SkImage::kRO_LegacyBitmapMode);
diff --git a/gm/drawminibitmaprect.cpp b/gm/drawminibitmaprect.cpp
index f5164f7..073d5a1 100644
--- a/gm/drawminibitmaprect.cpp
+++ b/gm/drawminibitmaprect.cpp
@@ -140,4 +140,3 @@
DEF_GM( return new DrawMiniBitmapRectGM(true); )
DEF_GM( return new DrawMiniBitmapRectGM(false); )
-
diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp
index 8ff40a8..4f0f071 100644
--- a/gm/dstreadshuffle.cpp
+++ b/gm/dstreadshuffle.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/gm/emptypath.cpp b/gm/emptypath.cpp
index 5afb3d5..aadb94d 100644
--- a/gm/emptypath.cpp
+++ b/gm/emptypath.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
@@ -201,7 +200,7 @@
canvas->translate(0, 40);
}
}
-
+
private:
typedef GM INHERITED;
};
diff --git a/gm/filterfastbounds.cpp b/gm/filterfastbounds.cpp
index 9e84024..bcecff9 100644
--- a/gm/filterfastbounds.cpp
+++ b/gm/filterfastbounds.cpp
@@ -298,14 +298,14 @@
for (int i = 0; i < (int)SK_ARRAY_COUNT(gDrawMthds) + kNumXtraCols; ++i) {
canvas->drawLine(SkIntToScalar(i * kTileWidth),
0,
- SkIntToScalar(i * kTileWidth),
+ SkIntToScalar(i * kTileWidth),
SkIntToScalar(paints.count() * kTileWidth),
blackFill);
}
// A column of saveLayers with PictureImageFilters
for (int i = 0; i < pifPaints.count(); ++i) {
- draw_savelayer_with_paint(SkIPoint::Make(0, i*kTileHeight),
+ draw_savelayer_with_paint(SkIPoint::Make(0, i*kTileHeight),
canvas, pifPaints[i]);
}
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index 67be00d..dd8b14d 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -262,7 +262,7 @@
paint.setTextSkewX(fSkewX);
const SkColor boundsColors[2] = { SK_ColorRED, SK_ColorBLUE };
-
+
SkFontMgr* fm = fFM;
int count = SkMin32(fm->countFamilies(), 32);
diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp
index e978b6b..bc5feb3 100644
--- a/gm/gammatext.cpp
+++ b/gm/gammatext.cpp
@@ -115,7 +115,7 @@
static void draw_pair(SkCanvas* canvas, SkPaint* paint, const sk_sp<SkShader>& shader) {
const char text[] = "Now is the time for all good";
const size_t len = strlen(text);
-
+
paint->setShader(nullptr);
canvas->drawText(text, len, 10, 20, *paint);
paint->setShader(SkShader::MakeColorShader(paint->getColor()));
@@ -140,7 +140,7 @@
SkString onShortName() override {
return SkString("gammagradienttext");
}
-
+
SkISize onISize() override {
return SkISize::Make(300, 300);
}
@@ -164,10 +164,9 @@
canvas->translate(0, 80);
}
}
-
+
private:
typedef skiagm::GM INHERITED;
};
DEF_GM( return new GammaShaderTextGM; )
-
diff --git a/gm/gm.cpp b/gm/gm.cpp
index ebdc4f1..e0cb8b8 100644
--- a/gm/gm.cpp
+++ b/gm/gm.cpp
@@ -107,4 +107,3 @@
SkString skiagm::SimpleGM::onShortName() {
return fName;
}
-
diff --git a/gm/gradientDirtyLaundry.cpp b/gm/gradientDirtyLaundry.cpp
index 3fca7f2..6b16be9 100644
--- a/gm/gradientDirtyLaundry.cpp
+++ b/gm/gradientDirtyLaundry.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/gm/gradients.cpp b/gm/gradients.cpp
index 29d0f31..11c27ba 100644
--- a/gm/gradients.cpp
+++ b/gm/gradients.cpp
@@ -510,7 +510,7 @@
paint.setDither(fDither);
canvas->drawRect(SkRect::MakeWH(500, 500), paint);
}
-
+
private:
sk_sp<SkShader> fShader;
bool fDither;
@@ -548,7 +548,7 @@
paint.setShader(fShader);
canvas->drawRect(SkRect::MakeWH(500, 500), paint);
}
-
+
private:
sk_sp<SkShader> fShader;
bool fDither;
@@ -600,7 +600,7 @@
(index + 1) * kHeight), paint);
}
}
-
+
private:
sk_sp<SkShader> fShader[100];
bool fDither;
diff --git a/gm/image.cpp b/gm/image.cpp
index c86be07..5333b17 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -291,7 +291,7 @@
canvas->translate(0, 120);
}
}
-
+
private:
typedef skiagm::GM INHERITED;
};
diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
index 3209221..fd7ac2a 100644
--- a/gm/image_pict.cpp
+++ b/gm/image_pict.cpp
@@ -373,6 +373,3 @@
#if SK_SUPPORT_GPU
DEF_GM( return new ImageCacheratorGM("texture", make_tex_generator); )
#endif
-
-
-
diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp
index 5fed7d1..214b05d 100644
--- a/gm/image_shader.cpp
+++ b/gm/image_shader.cpp
@@ -124,4 +124,3 @@
typedef skiagm::GM INHERITED;
};
DEF_GM( return new ImageShaderGM; )
-
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index ca8a2d4..d580243 100644
--- a/gm/imagefiltersbase.cpp
+++ b/gm/imagefiltersbase.cpp
@@ -298,7 +298,7 @@
canvas->translate(0, 200);
}
}
-
+
private:
typedef GM INHERITED;
};
@@ -322,4 +322,3 @@
}
};
DEF_GM( return new ImageFiltersText_CF; )
-
diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp
index 21d0704..b0c55dc 100644
--- a/gm/imagefiltersscaled.cpp
+++ b/gm/imagefiltersscaled.cpp
@@ -60,8 +60,8 @@
noisePaint.setShader(noise);
SkPoint3 pointLocation = SkPoint3::Make(0, 0, SkIntToScalar(10));
- SkPoint3 spotLocation = SkPoint3::Make(SkIntToScalar(-10),
- SkIntToScalar(-10),
+ SkPoint3 spotLocation = SkPoint3::Make(SkIntToScalar(-10),
+ SkIntToScalar(-10),
SkIntToScalar(20));
SkPoint3 spotTarget = SkPoint3::Make(SkIntToScalar(40), SkIntToScalar(40), 0);
SkScalar spotExponent = SK_Scalar1;
diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp
index 0d2637c..c3184be 100644
--- a/gm/imagefromyuvtextures.cpp
+++ b/gm/imagefromyuvtextures.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2015 Google Inc.
*
@@ -102,7 +101,7 @@
for (int i = 0; i < 3; ++i) {
SkASSERT(fYUVBmps[i].width() == SkToInt(fYUVBmps[i].rowBytes()));
yuvHandles[i] = gpu->createTestingOnlyBackendTexture(fYUVBmps[i].getPixels(),
- fYUVBmps[i].width(),
+ fYUVBmps[i].width(),
fYUVBmps[i].height(),
kAlpha_8_GrPixelConfig);
}
diff --git a/gm/imagesource2.cpp b/gm/imagesource2.cpp
index db8a9f6..3a3d273 100644
--- a/gm/imagesource2.cpp
+++ b/gm/imagesource2.cpp
@@ -47,7 +47,7 @@
int curColor = 0;
for (int x = 0; x < kImageSize; x += 3) {
- SkRect r = SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(0),
+ SkRect r = SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(0),
SkIntToScalar(3), SkIntToScalar(kImageSize));
SkPaint p;
p.setColor(gColors[curColor]);
diff --git a/gm/internal_links.cpp b/gm/internal_links.cpp
index bc1dc24..995cd69 100644
--- a/gm/internal_links.cpp
+++ b/gm/internal_links.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/gm/lcdblendmodes.cpp b/gm/lcdblendmodes.cpp
index 874714b..8ac9449 100644
--- a/gm/lcdblendmodes.cpp
+++ b/gm/lcdblendmodes.cpp
@@ -6,7 +6,7 @@
*/
-/*
+/*
* Tests text rendering with LCD and the various blend modes.
*/
@@ -40,7 +40,7 @@
const int kPointSize = 25;
fTextHeight = SkIntToScalar(kPointSize);
}
-
+
protected:
SkString onShortName() override {
return SkString("lcdblendmodes");
@@ -49,9 +49,9 @@
void onOnceBeforeDraw() override {
fCheckerboard = sk_tool_utils::create_checkerboard_shader(SK_ColorBLACK, SK_ColorWHITE, 4);
}
-
+
SkISize onISize() override { return SkISize::Make(kWidth, kHeight); }
-
+
void onDraw(SkCanvas* canvas) override {
SkPaint p;
p.setAntiAlias(false);
@@ -142,7 +142,7 @@
y+=fTextHeight;
}
}
-
+
private:
SkScalar fTextHeight;
sk_sp<SkShader> fCheckerboard;
diff --git a/gm/lcdtext.cpp b/gm/lcdtext.cpp
index a2bfa01..978bfd6 100644
--- a/gm/lcdtext.cpp
+++ b/gm/lcdtext.cpp
@@ -23,19 +23,19 @@
const int pointSize = 36;
textHeight = SkIntToScalar(pointSize);
}
-
+
protected:
-
+
SkString onShortName() {
SkString name("lcdtext");
name.append(sk_tool_utils::major_platform_os_name());
return name;
}
-
+
SkISize onISize() { return SkISize::Make(640, 480); }
-
+
virtual void onDraw(SkCanvas* canvas) {
-
+
y = textHeight;
drawText(canvas, SkString("TEXT: SubpixelTrue LCDRenderTrue"),
true, true);
@@ -46,7 +46,7 @@
drawText(canvas, SkString("TEXT: SubpixelFalse LCDRenderFalse"),
false, false);
}
-
+
void drawText(SkCanvas* canvas, const SkString& string,
bool subpixelTextEnabled, bool lcdRenderTextEnabled) {
SkPaint paint;
@@ -56,11 +56,11 @@
paint.setSubpixelText(subpixelTextEnabled);
paint.setLCDRenderText(lcdRenderTextEnabled);
paint.setTextSize(textHeight);
-
+
canvas->drawText(string.c_str(), string.size(), 0, y, paint);
y += textHeight;
}
-
+
private:
typedef skiagm::GM INHERITED;
SkScalar y, textHeight;
@@ -85,14 +85,14 @@
public:
LcdTextSizeGM() {}
-
+
protected:
SkString onShortName() {
return SkString("lcdtextsize");
}
-
+
SkISize onISize() { return SkISize::Make(320, 120); }
-
+
virtual void onDraw(SkCanvas* canvas) {
const char* lcd_text = "LCD";
const char* gray_text = "GRAY";
diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp
index 6d25671..54f698a 100644
--- a/gm/lightingshader.cpp
+++ b/gm/lightingshader.cpp
@@ -92,7 +92,7 @@
SkMatrix matrix;
matrix.setRectToRect(bitmapBounds, r, SkMatrix::kFill_ScaleToFit);
-
+
const SkMatrix& ctm = canvas->getTotalMatrix();
// TODO: correctly pull out the pure rotation
diff --git a/gm/localmatriximagefilter.cpp b/gm/localmatriximagefilter.cpp
index dd86c96..d53380b 100644
--- a/gm/localmatriximagefilter.cpp
+++ b/gm/localmatriximagefilter.cpp
@@ -99,4 +99,3 @@
typedef GM INHERITED;
};
DEF_GM( return new LocalMatrixImageFilterGM; )
-
diff --git a/gm/mipmap.cpp b/gm/mipmap.cpp
index 9a0f060..ae73a8d 100644
--- a/gm/mipmap.cpp
+++ b/gm/mipmap.cpp
@@ -47,4 +47,3 @@
}
canvas->drawImage(img.get(), 20, 20, nullptr);
}
-
diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp
index 03934a6..787646f 100644
--- a/gm/multipicturedraw.cpp
+++ b/gm/multipicturedraw.cpp
@@ -424,7 +424,7 @@
SkCanvas* subCanvas = step.fSurf->getCanvas();
- const SkMatrix trans = SkMatrix::MakeTrans(-SkIntToScalar(x*kTileWidth),
+ const SkMatrix trans = SkMatrix::MakeTrans(-SkIntToScalar(x*kTileWidth),
-SkIntToScalar(y*kTileHeight));
create_content(mpd, pfGen, pictures, subCanvas, trans);
@@ -518,7 +518,7 @@
SkString onShortName() override {
static const char* gContentNames[] = {
- "noclip", "rectclip", "rrectclip", "pathclip",
+ "noclip", "rectclip", "rrectclip", "pathclip",
"invpathclip", "sierpinski", "biglayer"
};
static const char* gLayoutNames[] = { "simple", "tiled" };
diff --git a/gm/ninepatchstretch.cpp b/gm/ninepatchstretch.cpp
index 9b0b94e..4c6e7d2 100644
--- a/gm/ninepatchstretch.cpp
+++ b/gm/ninepatchstretch.cpp
@@ -110,4 +110,3 @@
typedef skiagm::GM INHERITED;
};
DEF_GM( return new NinePatchStretchGM; )
-
diff --git a/gm/offsetimagefilter.cpp b/gm/offsetimagefilter.cpp
index dd33d9d..11da041 100644
--- a/gm/offsetimagefilter.cpp
+++ b/gm/offsetimagefilter.cpp
@@ -34,7 +34,7 @@
void onOnceBeforeDraw() override {
fBitmap = SkImage::MakeFromBitmap(
sk_tool_utils::create_string_bitmap(80, 80, 0xD000D000, 15, 65, 96, "e"));
-
+
fCheckerboard = SkImage::MakeFromBitmap(
sk_tool_utils::create_checkerboard_bitmap(80, 80,
sk_tool_utils::color_to_565(0xFFA0A0A0),
@@ -103,14 +103,14 @@
class SimpleOffsetImageFilterGM : public skiagm::GM {
public:
SimpleOffsetImageFilterGM() {}
-
+
protected:
SkString onShortName() override {
return SkString("simple-offsetimagefilter");
}
-
+
SkISize onISize() override { return SkISize::Make(640, 200); }
-
+
void doDraw(SkCanvas* canvas, const SkRect& r, SkImageFilter* imgf,
const SkRect* clipR = nullptr) {
SkPaint p;
@@ -157,22 +157,22 @@
SkImageFilter::CropRect cr2(r2);
canvas->translate(40, 40);
-
+
canvas->save();
this->doDraw(canvas, r, nullptr);
-
+
canvas->translate(100, 0);
this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20));
-
+
canvas->translate(100, 0);
this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, nullptr, &cr0));
-
+
canvas->translate(100, 0);
this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20), &r);
-
+
canvas->translate(100, 0);
this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, nullptr, &cr1));
-
+
SkRect clipR = SkRect::MakeXYWH(40, 40, 40, 40);
canvas->translate(100, 0);
this->doDraw(canvas, r, SkOffsetImageFilter::Create(20, 20, nullptr, nullptr), &clipR);
diff --git a/gm/ovals.cpp b/gm/ovals.cpp
index 580426b..1374b7d 100755
--- a/gm/ovals.cpp
+++ b/gm/ovals.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/gm/patch.cpp b/gm/patch.cpp
index 5b661f4..d27c4e1 100644
--- a/gm/patch.cpp
+++ b/gm/patch.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2014 Google Inc.
*
@@ -16,7 +15,7 @@
SK_ColorYELLOW,
};
const SkPoint pts[] = { { 100.f / 4.f, 0.f }, { 3.f * 100.f / 4.f, 100.f } };
-
+
return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors),
SkShader::kMirror_TileMode);
}
@@ -66,7 +65,7 @@
DEF_SIMPLE_GM(patch_primitive, canvas, 800, 800) {
SkPaint paint;
-
+
// The order of the colors and points is clockwise starting at upper-left corner.
const SkPoint cubics[SkPatchUtils::kNumCtrlPts] = {
//top points
@@ -78,22 +77,22 @@
//left points
{50,250},{150,150}
};
-
+
const SkColor colors[SkPatchUtils::kNumCorners] = {
SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorCYAN
};
const SkPoint texCoords[SkPatchUtils::kNumCorners] = {
{0.0f, 0.0f}, {100.0f, 0.0f}, {100.0f,100.0f}, {0.0f, 100.0f}}
;
-
+
const SkXfermode::Mode modes[] = {
SkXfermode::kSrc_Mode,
SkXfermode::kDst_Mode,
SkXfermode::kModulate_Mode,
};
-
+
sk_sp<SkShader> shader(make_shader());
-
+
canvas->save();
for (int y = 0; y < 3; y++) {
SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(modes[y]));
@@ -121,7 +120,7 @@
default:
break;
}
-
+
draw_control_points(canvas, cubics);
canvas->restore();
}
diff --git a/gm/patchgrid.cpp b/gm/patchgrid.cpp
index 6f77d48..962c1a9 100644
--- a/gm/patchgrid.cpp
+++ b/gm/patchgrid.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2014 Google Inc.
*
@@ -57,7 +56,7 @@
* This GM draws a grid of patches, it only uses colors so it could be considered a mesh gradient.
*/
class SkPatchGridGM : public GM {
-
+
public:
SkPatchGridGM() {
this->setBGColor(0xFFFFFFFF);
@@ -75,28 +74,28 @@
void onDraw(SkCanvas* canvas) override {
SkPaint paint;
-
+
SkPoint vertices[4][5] = {
{{50,50}, {150,50}, {250,50},{350,50},{450,50}},
{{50,150}, {120,120}, {250,150},{350,150},{450,150}},
{{50,250}, {150,250}, {250,250},{350,250},{450,250}},
{{100,300}, {150,350}, {250,350},{350,350},{450,350}}
};
-
+
SkColor cornerColors[4][5] = {
{SK_ColorBLUE, SK_ColorRED, SK_ColorBLUE, SK_ColorRED, SK_ColorBLUE},
{SK_ColorRED, SK_ColorBLUE, SK_ColorRED, SK_ColorBLUE, SK_ColorRED},
{SK_ColorBLUE, SK_ColorRED, SK_ColorBLUE, SK_ColorRED, SK_ColorBLUE},
{SK_ColorRED, SK_ColorBLUE, SK_ColorRED, SK_ColorBLUE, SK_ColorRED},
};
-
+
SkPoint hrzCtrl[4][8] = {
{{75,30},{125,45},{175,70},{225,20},{275,50},{325,50},{375,5},{425,90}},
{{75,150},{125,150},{175,150},{225,150},{275,150},{325,150},{375,150},{425,150}},
{{75,250},{125,250},{175,250},{225,250},{275,200},{325,150},{375,250},{425,250}},
{{75,350},{125,350},{175,350},{225,350},{275,350},{325,350},{375,350},{425,350}}
};
-
+
SkPoint vrtCtrl[6][5] = {
{{50,75},{150,75},{250,75},{350,75},{450,75}},
{{50,125},{150,125},{250,125},{350,125},{450,125}},
@@ -105,42 +104,42 @@
{{50,275},{150,275},{250,275},{350,275},{400,305}},
{{50,325},{150,325},{250,325},{350,325},{450,325}}
};
-
+
static const int kRows = 3;
static const int kCols = 4;
-
+
canvas->scale(3, 3);
SkPatchGrid grid(kRows, kCols, SkPatchGrid::kColors_VertexType, nullptr);
for (int i = 0; i < kRows; i++) {
for (int j = 0; j < kCols; j++) {
SkPoint points[12];
-
+
//set corners
points[SkPatchUtils::kTopP0_CubicCtrlPts] = vertices[i][j];
points[SkPatchUtils::kTopP3_CubicCtrlPts] = vertices[i][j + 1];
points[SkPatchUtils::kBottomP0_CubicCtrlPts] = vertices[i + 1][j];
points[SkPatchUtils::kBottomP3_CubicCtrlPts] = vertices[i + 1][j + 1];
-
+
points[SkPatchUtils::kTopP1_CubicCtrlPts] = hrzCtrl[i][j * 2];
points[SkPatchUtils::kTopP2_CubicCtrlPts] = hrzCtrl[i][j * 2 + 1];
points[SkPatchUtils::kBottomP1_CubicCtrlPts] = hrzCtrl[i + 1][j * 2];
points[SkPatchUtils::kBottomP2_CubicCtrlPts] = hrzCtrl[i + 1][j * 2 + 1];
-
+
points[SkPatchUtils::kLeftP1_CubicCtrlPts] = vrtCtrl[i * 2][j];
points[SkPatchUtils::kLeftP2_CubicCtrlPts] = vrtCtrl[i * 2 + 1][j];
points[SkPatchUtils::kRightP1_CubicCtrlPts] = vrtCtrl[i * 2][j + 1];
points[SkPatchUtils::kRightP2_CubicCtrlPts] = vrtCtrl[i * 2 + 1][j + 1];
-
+
SkColor colors[4];
colors[0] = cornerColors[i][j];
colors[1] = cornerColors[i][j + 1];
colors[3] = cornerColors[i + 1][j];
colors[2] = cornerColors[i + 1][j + 1];
-
+
grid.setPatch(j, i, points, colors, nullptr);
}
}
-
+
grid.draw(canvas, paint);
SkISize dims = grid.getDimensions();
for (int y = 0; y < dims.height(); y++) {
diff --git a/gm/path_stroke_with_zero_length.cpp b/gm/path_stroke_with_zero_length.cpp
index f69b5f9..ab92736 100644
--- a/gm/path_stroke_with_zero_length.cpp
+++ b/gm/path_stroke_with_zero_length.cpp
@@ -193,4 +193,3 @@
///////////////////////////////////////////////////////////////////////////////
DEF_GM( return new StrokeZeroGM(); )
-
diff --git a/gm/pathcontourstart.cpp b/gm/pathcontourstart.cpp
index dbda7c3..56f6492 100644
--- a/gm/pathcontourstart.cpp
+++ b/gm/pathcontourstart.cpp
@@ -127,4 +127,3 @@
DEF_GM( return new ContourStartGM(); )
} // namespace skiagm
-
diff --git a/gm/pathreverse.cpp b/gm/pathreverse.cpp
index 3350765..f0ce051 100644
--- a/gm/pathreverse.cpp
+++ b/gm/pathreverse.cpp
@@ -15,7 +15,7 @@
* paint.setTextSize(SkIntToScalar(100));
* paint.setTypeface(SkTypeface::CreateFromName("Hiragino Maru Gothic Pro"));
* paint.getTextPath("e", 1, 50, 50, &path);
- *
+ *
* The path data is duplicated here to allow the test to
* run on all platforms and to remove the bug dependency
* should future Macs edit or delete the font.
diff --git a/gm/picture.cpp b/gm/picture.cpp
index 904046d..1ea8ada 100644
--- a/gm/picture.cpp
+++ b/gm/picture.cpp
@@ -23,7 +23,7 @@
paint.setColor(0x80FF0000);
path.moveTo(0, 0); path.lineTo(100, 0); path.lineTo(100, 100);
canvas->drawPath(path, paint);
-
+
paint.setColor(0x8000FF00);
path.reset(); path.moveTo(0, 0); path.lineTo(100, 0); path.lineTo(0, 100);
canvas->drawPath(path, paint);
@@ -63,10 +63,10 @@
SkPaint paint;
canvas->drawPicture(fPicture);
-
+
matrix.setTranslate(110, 0);
canvas->drawPicture(fPicture, &matrix, nullptr);
-
+
matrix.postTranslate(110, 0);
canvas->drawPicture(fPicture, &matrix, &paint);
diff --git a/gm/pixelsnap.cpp b/gm/pixelsnap.cpp
index 7791acb..1711f5e 100644
--- a/gm/pixelsnap.cpp
+++ b/gm/pixelsnap.cpp
@@ -36,7 +36,7 @@
SkPaint bgPaint;
bgPaint.setShader(
sk_tool_utils::create_checkerboard_shader(
- sk_tool_utils::color_to_565(0xFFAAAAAA),
+ sk_tool_utils::color_to_565(0xFFAAAAAA),
sk_tool_utils::color_to_565(0xFF777777), 1));
canvas->drawPaint(bgPaint);
diff --git a/gm/points.cpp b/gm/points.cpp
index eda3121..0aa6fd8 100644
--- a/gm/points.cpp
+++ b/gm/points.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/recordopts.cpp b/gm/recordopts.cpp
index 3c44f4a..d920a17 100644
--- a/gm/recordopts.cpp
+++ b/gm/recordopts.cpp
@@ -213,4 +213,3 @@
}
}
}
-
diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp
index 43d008a..47390e2 100644
--- a/gm/rectangletexture.cpp
+++ b/gm/rectangletexture.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2016 Google Inc.
*
@@ -95,7 +94,7 @@
GR_GL_CALL(gl, TexParameteri(TARGET, GR_GL_TEXTURE_MIN_FILTER,
GR_GL_NEAREST));
GR_GL_CALL(gl, TexParameteri(TARGET, GR_GL_TEXTURE_WRAP_S,
- GR_GL_CLAMP_TO_EDGE));
+ GR_GL_CLAMP_TO_EDGE));
GR_GL_CALL(gl, TexParameteri(TARGET, GR_GL_TEXTURE_WRAP_T,
GR_GL_CLAMP_TO_EDGE));
GR_GL_CALL(gl, TexImage2D(TARGET, 0, GR_GL_RGBA, width, height, 0,
diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp
index d0401f0..514e43a 100644
--- a/gm/roundrects.cpp
+++ b/gm/roundrects.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp
index 13fa283..f794481 100644
--- a/gm/shadertext.cpp
+++ b/gm/shadertext.cpp
@@ -133,7 +133,7 @@
SkShader::kClamp_TileMode);
}
}
-
+
SkBitmap bm;
makebm(&bm, w/16, h/4);
for (size_t tx = 0; tx < SK_ARRAY_COUNT(tileModes); ++tx) {
diff --git a/gm/shallowgradient.cpp b/gm/shallowgradient.cpp
index 6990ba7..ad1de63 100644
--- a/gm/shallowgradient.cpp
+++ b/gm/shallowgradient.cpp
@@ -50,7 +50,7 @@
}
void onDraw(SkCanvas* canvas) override {
- const SkColor colors[] = { sk_tool_utils::color_to_565(0xFF555555),
+ const SkColor colors[] = { sk_tool_utils::color_to_565(0xFF555555),
sk_tool_utils::color_to_565(0xFF444444) };
const int colorCount = SK_ARRAY_COUNT(colors);
diff --git a/gm/shapes.cpp b/gm/shapes.cpp
index 02b6a98..ee0920e 100644
--- a/gm/shapes.cpp
+++ b/gm/shapes.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2016 Google Inc.
*
diff --git a/gm/showmiplevels.cpp b/gm/showmiplevels.cpp
index fd1254f..717d629 100644
--- a/gm/showmiplevels.cpp
+++ b/gm/showmiplevels.cpp
@@ -204,7 +204,7 @@
canvas->translate(0, bm.height() * 0.85f);
}
}
-
+
private:
typedef skiagm::GM INHERITED;
};
@@ -300,7 +300,7 @@
canvas->translate(0, SkScalarRoundToScalar(bm.height() * 0.85f));
}
}
-
+
private:
typedef skiagm::GM INHERITED;
};
diff --git a/gm/smallpaths.cpp b/gm/smallpaths.cpp
index fd89f70..926b2a2 100644
--- a/gm/smallpaths.cpp
+++ b/gm/smallpaths.cpp
@@ -63,16 +63,16 @@
static SkScalar yOffset = 50.f;
path->moveTo(-32.5f + xOffset, 0.0f + yOffset);
path->lineTo(32.5f + xOffset, 0.0f + yOffset);
-
+
path->moveTo(-32.5f + xOffset, 19 + yOffset);
path->lineTo(32.5f + xOffset, 19 + yOffset);
-
+
path->moveTo(-32.5f + xOffset, -19 + yOffset);
path->lineTo(32.5f + xOffset, -19 + yOffset);
path->lineTo(-32.5f + xOffset, -19 + yOffset);
-
+
path->close();
-
+
return SkIntToScalar(70);
}
@@ -81,16 +81,16 @@
static SkScalar yOffset = 40.f;
path->moveTo(-26.f + xOffset, 0.0f + yOffset);
path->lineTo(26.f + xOffset, 0.0f + yOffset);
-
+
path->moveTo(-28.f + xOffset, -2.4748745f + yOffset);
path->lineTo(0 + xOffset, 25.525126f + yOffset);
-
+
path->moveTo(-28.f + xOffset, 2.4748745f + yOffset);
path->lineTo(0 + xOffset, -25.525126f + yOffset);
path->lineTo(-28.f + xOffset, 2.4748745f + yOffset);
path->close();
-
+
return SkIntToScalar(70);
}
@@ -101,7 +101,7 @@
path->conicTo(435.93292f + xOffset, 56.000031f + yOffset,
382.61078f + xOffset, 69.752716f + yOffset,
0.9920463f);
-
+
return SkIntToScalar(40);
}
@@ -118,7 +118,7 @@
path->lineTo(24.67f + xOffset, 5.3299999f);
path->lineTo(24.67f + xOffset, 0.33000004f);
path->close();
-
+
path->moveTo(25.727224f + xOffset, 12.886665f);
path->lineTo(10.907918f + xOffset, 12.886665f);
path->lineTo(7.5166659f + xOffset, 28.683645f);
@@ -133,14 +133,14 @@
static SkScalar make_battery2(SkPath* path) {
static SkScalar xOffset = 5.f;
-
+
path->moveTo(32.669998f + xOffset, 9.8640003f);
path->lineTo(0.33000004f + xOffset, 9.8640003f);
path->lineTo(0.33000004f + xOffset, 50.669998f);
path->lineTo(32.669998f + xOffset, 50.669998f);
path->lineTo(32.669998f + xOffset, 9.8640003f);
path->close();
-
+
path->moveTo(10.907918f + xOffset, 12.886665f);
path->lineTo(25.727224f + xOffset, 12.886665f);
path->lineTo(16.854223f + xOffset, 25.136419f);
@@ -150,7 +150,7 @@
path->lineTo(7.5166659f + xOffset, 28.683645f);
path->lineTo(10.907918f + xOffset, 12.886665f);
path->close();
-
+
return SkIntToScalar(70);
}
@@ -229,7 +229,7 @@
}
canvas->restore();
canvas->translate(SkIntToScalar(120), SkIntToScalar(0));
-
+
// second column: stroked paths
canvas->save();
paint.setStyle(SkPaint::kStroke_Style);
@@ -242,7 +242,7 @@
}
canvas->restore();
canvas->translate(SkIntToScalar(120), SkIntToScalar(0));
-
+
// third column: stroked paths with different widths
canvas->save();
paint.setStyle(SkPaint::kStroke_Style);
@@ -255,7 +255,7 @@
}
canvas->restore();
canvas->translate(SkIntToScalar(120), SkIntToScalar(0));
-
+
// fourth column: stroked and filled paths
paint.setStyle(SkPaint::kStrokeAndFill_Style);
paint.setStrokeCap(SkPaint::kButt_Cap);
@@ -265,7 +265,7 @@
canvas->drawPath(fPath[i], paint);
canvas->translate(SkIntToScalar(0), fDY[i]);
}
-
+
}
private:
@@ -273,4 +273,3 @@
};
DEF_GM(return new SmallPathsGM;)
-
diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp
index fc1a281..98e9bbb 100644
--- a/gm/strokefill.cpp
+++ b/gm/strokefill.cpp
@@ -258,12 +258,12 @@
paint.setAntiAlias(true);
paint.setTextSize(SkIntToScalar(100));
paint.setStrokeWidth(SkIntToScalar(5));
-
+
// use paths instead of text to test the path data on all platforms, since the
// Mac-specific font may change or is not available everywhere
path_bold(canvas, papyrus_hello(), paint);
path_bold(canvas, hiragino_maru_gothic_pro_dash(), paint);
-
+
// use the portable typeface to generically test the fake bold code everywhere
// (as long as the freetype option to do the bolding itself isn't enabled)
sk_tool_utils::set_portable_typeface(&paint, "serif");
@@ -304,7 +304,7 @@
path3.addRect(r, SkPath::kCCW_Direction);
canvas->drawPath(path3, paint);
- r = SkRect::MakeXYWH(x + SkIntToScalar(70), y + SkIntToScalar(280),
+ r = SkRect::MakeXYWH(x + SkIntToScalar(70), y + SkIntToScalar(280),
SkIntToScalar(100), SkIntToScalar(100));
SkPath path4;
path4.setFillType(SkPath::kWinding_FillType);
@@ -313,7 +313,7 @@
path4.addRect(r, SkPath::kCW_Direction);
canvas->drawPath(path4, paint);
- r = SkRect::MakeXYWH(x + SkIntToScalar(190), y + SkIntToScalar(280),
+ r = SkRect::MakeXYWH(x + SkIntToScalar(190), y + SkIntToScalar(280),
SkIntToScalar(100), SkIntToScalar(100));
path4.reset();
SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path4, nullptr));
@@ -322,7 +322,7 @@
path4.moveTo(0, 0); // test for crbug.com/247770
canvas->drawPath(path4, paint);
- r = SkRect::MakeXYWH(x + SkIntToScalar(310), y + SkIntToScalar(280),
+ r = SkRect::MakeXYWH(x + SkIntToScalar(310), y + SkIntToScalar(280),
SkIntToScalar(100), SkIntToScalar(100));
path4.reset();
SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path4, nullptr));
diff --git a/gm/strokerects.cpp b/gm/strokerects.cpp
index f5167bb..afd41b2 100644
--- a/gm/strokerects.cpp
+++ b/gm/strokerects.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/strokes.cpp b/gm/strokes.cpp
index f64a876..61f5a8a 100644
--- a/gm/strokes.cpp
+++ b/gm/strokes.cpp
@@ -243,7 +243,7 @@
p.setStrokeWidth(0);
SkPath path;
SkPoint pts[] = {{105.738571f,13.126318f},
- {105.738571f,13.126318f},
+ {105.738571f,13.126318f},
{123.753784f,1.f}};
SkVector tangent = pts[1] - pts[2];
tangent.normalize();
@@ -449,7 +449,7 @@
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(0.055f);
-
+
canvas->scale(1000, 1000);
canvas->drawCircle(0, 2, 1.97f, paint);
}
diff --git a/gm/surface.cpp b/gm/surface.cpp
index 436ea95..901e324 100644
--- a/gm/surface.cpp
+++ b/gm/surface.cpp
@@ -86,7 +86,7 @@
{ kRGB_V_SkPixelGeometry, "RGB_V" },
{ kBGR_V_SkPixelGeometry, "BGR_V" },
};
-
+
SkScalar x = 0;
for (int disallowAA = 0; disallowAA <= 1; ++disallowAA) {
for (int disallowDither = 0; disallowDither <= 1; ++disallowDither) {
@@ -156,4 +156,3 @@
typedef GM INHERITED;
};
DEF_GM( return new NewSurfaceGM )
-
diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp
index c9ca474..a644bd1 100644
--- a/gm/tablecolorfilter.cpp
+++ b/gm/tablecolorfilter.cpp
@@ -209,12 +209,12 @@
{
fName.printf("colorcomposefilter_%s", suffix);
}
-
+
protected:
virtual SkString onShortName() {
return fName;
}
-
+
virtual SkISize onISize() {
return SkISize::Make(790, 790);
}
@@ -270,7 +270,7 @@
canvas->translate(0, r.height() + spacer);
}
}
-
+
private:
typedef GM INHERITED;
};
diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index 4b484cc..8e29b23 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/textblobblockreordering.cpp b/gm/textblobblockreordering.cpp
index 6542825..31ba3c7 100644
--- a/gm/textblobblockreordering.cpp
+++ b/gm/textblobblockreordering.cpp
@@ -58,9 +58,9 @@
SkRect bounds = fBlob->bounds();
const int yDelta = SkScalarFloorToInt(bounds.height()) + 20;
const int xDelta = SkScalarFloorToInt(bounds.width());
-
+
canvas->drawTextBlob(fBlob, 0, 0, paint);
-
+
canvas->translate(SkIntToScalar(xDelta), SkIntToScalar(yDelta));
// draw a rect where the text should be, and then twiddle the xfermode
@@ -84,7 +84,7 @@
typedef GM INHERITED;
};
-
+
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TextBlobBlockReordering;)
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index 6bd6490..89d3b44 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2014 Google Inc.
*
diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
index d774939..b7f0d45 100644
--- a/gm/tilemodes.cpp
+++ b/gm/tilemodes.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp
index 21224b4..3bcb0fa 100644
--- a/gm/tilemodes_scaled.cpp
+++ b/gm/tilemodes_scaled.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp
index 1162b2d..fc226c1 100644
--- a/gm/tinybitmap.cpp
+++ b/gm/tinybitmap.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp
index 4896cc9..12576c2 100644
--- a/gm/verttext2.cpp
+++ b/gm/verttext2.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/gm/verylargebitmap.cpp b/gm/verylargebitmap.cpp
index 78f8f59..f257bf9 100644
--- a/gm/verylargebitmap.cpp
+++ b/gm/verylargebitmap.cpp
@@ -120,4 +120,3 @@
};
DEF_GM( return new VeryLargeBitmapGM(make_raster_image, "bitmap"); )
DEF_GM( return new VeryLargeBitmapGM(make_picture_image, "_picture_image"); )
-
diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp
index a1427cf..821bb8c 100644
--- a/gm/xfermodes.cpp
+++ b/gm/xfermodes.cpp
@@ -61,7 +61,7 @@
kSmallTransparentImage_SrcType = 0x40,
//! kRectangleImage_SrcType drawn directly with a mask.
kRectangleWithMask_SrcType = 0x80,
-
+
kAll_SrcType = 0xFF, //!< All the source types.
kBasic_SrcType = 0x03, //!< Just basic source types.
};
@@ -87,7 +87,7 @@
{ SkXfermode::kDstOut_Mode, "DstOut", kAll_SrcType },
{ SkXfermode::kSrcATop_Mode, "SrcATop", kAll_SrcType },
{ SkXfermode::kDstATop_Mode, "DstATop", kAll_SrcType },
-
+
{ SkXfermode::kXor_Mode, "Xor", kBasic_SrcType },
{ SkXfermode::kPlus_Mode, "Plus", kBasic_SrcType },
{ SkXfermode::kModulate_Mode, "Modulate", kAll_SrcType },
diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp
index 397f4e1..0956af6 100644
--- a/gm/xfermodes2.cpp
+++ b/gm/xfermodes2.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index 4aafb7a..996e473 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2014 Google Inc.
*