aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm
diff options
context:
space:
mode:
Diffstat (limited to 'gm')
-rw-r--r--gm/imageblur2.cpp6
-rw-r--r--gm/inversepaths.cpp6
-rw-r--r--gm/lighting.cpp6
-rw-r--r--gm/patheffects.cpp6
-rw-r--r--gm/pathfill.cpp12
-rw-r--r--gm/pathinterior.cpp2
-rw-r--r--gm/pathreverse.cpp6
-rw-r--r--gm/peekpixels.cpp2
-rw-r--r--gm/points.cpp6
-rw-r--r--gm/quadpaths.cpp12
-rw-r--r--gm/rrect.cpp6
-rw-r--r--gm/samplerstress.cpp7
-rw-r--r--gm/shaderbounds.cpp6
-rw-r--r--gm/shadertext.cpp6
-rw-r--r--gm/shadertext2.cpp6
-rw-r--r--gm/spritebitmap.cpp6
-rw-r--r--gm/stringart.cpp6
-rw-r--r--gm/strokefill.cpp6
-rw-r--r--gm/strokerect.cpp6
-rw-r--r--gm/strokerects.cpp6
-rw-r--r--gm/strokes.cpp18
-rw-r--r--gm/testimagefilters.cpp6
-rw-r--r--gm/texdata.cpp6
-rw-r--r--gm/tiledscaledbitmap.cpp10
-rw-r--r--gm/tilemodes.cpp10
-rw-r--r--gm/tilemodes_scaled.cpp11
-rw-r--r--gm/verttext.cpp6
-rw-r--r--gm/verttext2.cpp7
-rw-r--r--gm/xfermodes.cpp6
29 files changed, 101 insertions, 104 deletions
diff --git a/gm/imageblur2.cpp b/gm/imageblur2.cpp
index b7c9f9d9c8..629d384048 100644
--- a/gm/imageblur2.cpp
+++ b/gm/imageblur2.cpp
@@ -40,15 +40,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return fName;
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(WIDTH, HEIGHT);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
const int sigmaCount = SK_ARRAY_COUNT(kBlurSigmas);
const int testStringCount = SK_ARRAY_COUNT(kTestStrings);
SkScalar dx = WIDTH / sigmaCount;
diff --git a/gm/inversepaths.cpp b/gm/inversepaths.cpp
index c7161597c2..64af2b178c 100644
--- a/gm/inversepaths.cpp
+++ b/gm/inversepaths.cpp
@@ -74,15 +74,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("inverse_paths");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(800, 900);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkScalar cx = slideWidth / 2 + slideBoundary;
SkScalar cy = slideHeight / 2 + slideBoundary;
SkScalar dx = slideWidth + 2 * slideBoundary;
diff --git a/gm/lighting.cpp b/gm/lighting.cpp
index e7842a9c81..e56d9fc0c7 100644
--- a/gm/lighting.cpp
+++ b/gm/lighting.cpp
@@ -24,7 +24,7 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("lighting");
}
@@ -41,7 +41,7 @@ protected:
canvas.drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint);
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(WIDTH, HEIGHT);
}
@@ -54,7 +54,7 @@ protected:
canvas->restore();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
if (!fInitialized) {
make_bitmap();
fInitialized = true;
diff --git a/gm/patheffects.cpp b/gm/patheffects.cpp
index 7177a531f1..00ae21529b 100644
--- a/gm/patheffects.cpp
+++ b/gm/patheffects.cpp
@@ -111,13 +111,13 @@ protected:
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return SkString("patheffect");
}
- SkISize onISize() { return SkISize::Make(800, 600); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
paint.setStyle(SkPaint::kStroke_Style);
diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp
index 01811e3c94..80342d6d54 100644
--- a/gm/pathfill.cpp
+++ b/gm/pathfill.cpp
@@ -129,15 +129,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("pathfill");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 480);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
@@ -167,11 +167,11 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("pathinvfill");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(450, 220);
}
@@ -188,7 +188,7 @@ protected:
canvas->restore();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPath path;
path.addCircle(SkIntToScalar(50), SkIntToScalar(50), SkIntToScalar(40));
diff --git a/gm/pathinterior.cpp b/gm/pathinterior.cpp
index 559fb8973c..865e32b5de 100644
--- a/gm/pathinterior.cpp
+++ b/gm/pathinterior.cpp
@@ -25,7 +25,7 @@ public:
}
protected:
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(770, 770);
}
diff --git a/gm/pathreverse.cpp b/gm/pathreverse.cpp
index fd13404198..7cb7ba1cdc 100644
--- a/gm/pathreverse.cpp
+++ b/gm/pathreverse.cpp
@@ -72,15 +72,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("path-reverse");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 480);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
if (false) test_rev(canvas); // avoid bit rot, suppress warning
SkRect r = { 10, 10, 100, 60 };
diff --git a/gm/peekpixels.cpp b/gm/peekpixels.cpp
index 01a60c124f..b5573f3458 100644
--- a/gm/peekpixels.cpp
+++ b/gm/peekpixels.cpp
@@ -64,7 +64,7 @@ protected:
}
}
- virtual uint32_t onGetFlags() const {
+ virtual uint32_t onGetFlags() const SK_OVERRIDE {
// we explicitly test peekPixels and readPixels, neither of which
// return something for a picture-backed canvas, so we skip that test.
return kSkipPicture_Flag;
diff --git a/gm/points.cpp b/gm/points.cpp
index b241fe019e..1f9a5811b1 100644
--- a/gm/points.cpp
+++ b/gm/points.cpp
@@ -19,11 +19,11 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("points");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 490);
}
@@ -38,7 +38,7 @@ protected:
}
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->translate(SK_Scalar1, SK_Scalar1);
SkRandom rand;
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp
index 1dbb3d090c..f6e9fad07f 100644
--- a/gm/quadpaths.cpp
+++ b/gm/quadpaths.cpp
@@ -20,11 +20,11 @@ protected:
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return SkString("quadpath");
}
- SkISize onISize() { return SkISize::Make(1240, 390); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(1240, 390); }
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
@@ -43,7 +43,7 @@ protected:
canvas->restore();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
struct FillAndName {
SkPath::FillType fFill;
const char* fName;
@@ -168,11 +168,11 @@ protected:
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return SkString("quadclosepath");
}
- SkISize onISize() { return SkISize::Make(1240, 390); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(1240, 390); }
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
@@ -191,7 +191,7 @@ protected:
canvas->restore();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
struct FillAndName {
SkPath::FillType fFill;
const char* fName;
diff --git a/gm/rrect.cpp b/gm/rrect.cpp
index 8e26b1b897..a426707b87 100644
--- a/gm/rrect.cpp
+++ b/gm/rrect.cpp
@@ -130,15 +130,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("rrect");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(820, 710);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
static const InsetProc insetProcs[] = {
inset0, inset1, inset2, inset3
};
diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp
index 29be6843f9..fc7d76c569 100644
--- a/gm/samplerstress.cpp
+++ b/gm/samplerstress.cpp
@@ -32,11 +32,11 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("gpusamplerstress");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 480);
}
@@ -91,8 +91,7 @@ protected:
fMaskFilter.reset(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, sigma));
}
- virtual void onDraw(SkCanvas* canvas) {
-
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
createShader();
createMaskFilter();
diff --git a/gm/shaderbounds.cpp b/gm/shaderbounds.cpp
index 55e334cb3a..6820fc6359 100644
--- a/gm/shaderbounds.cpp
+++ b/gm/shaderbounds.cpp
@@ -38,11 +38,11 @@ protected:
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return fName;
}
- virtual SkISize onISize() { return SkISize::Make(320, 240); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(320, 240); }
virtual SkMatrix onGetInitialTransform() const SK_OVERRIDE {
SkMatrix result;
@@ -52,7 +52,7 @@ protected:
return result;
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
// The PDF device has already clipped to the content area, but we
// do it again here so that the raster and pdf results are consistent.
canvas->clipRect(SkRect::MakeWH(SkIntToScalar(320),
diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp
index 37be71092f..30b15735d7 100644
--- a/gm/shadertext.cpp
+++ b/gm/shadertext.cpp
@@ -95,13 +95,13 @@ protected:
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return SkString("shadertext");
}
- SkISize onISize() { return SkISize::Make(1450, 500); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(1450, 500); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
const char text[] = "Shaded Text";
const int textLen = SK_ARRAY_COUNT(text) - 1;
const int pointSize = 36;
diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp
index d73fb6f8f3..d33a203674 100644
--- a/gm/shadertext2.cpp
+++ b/gm/shadertext2.cpp
@@ -48,13 +48,13 @@ public:
protected:
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return SkString("shadertext2");
}
- SkISize onISize() { return SkISize::Make(1800, 900); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(1800, 900); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
static const char kText[] = "SKIA";
static const int kTextLen = SK_ARRAY_COUNT(kText) - 1;
static const int kPointSize = 55;
diff --git a/gm/spritebitmap.cpp b/gm/spritebitmap.cpp
index a387dd3a9a..f22c429b51 100644
--- a/gm/spritebitmap.cpp
+++ b/gm/spritebitmap.cpp
@@ -66,15 +66,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("spritebitmap");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 480);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkBitmap bm;
make_bm(&bm);
diff --git a/gm/stringart.cpp b/gm/stringart.cpp
index 24d7b14442..2d6b737434 100644
--- a/gm/stringart.cpp
+++ b/gm/stringart.cpp
@@ -27,15 +27,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("stringart");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(kWidth, kHeight);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkScalar angle = kAngle*SK_ScalarPI + SkScalarHalf(SK_ScalarPI);
SkScalar size = SkIntToScalar(SkMin32(kWidth, kHeight));
SkPoint center = SkPoint::Make(SkScalarHalf(kWidth), SkScalarHalf(kHeight));
diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp
index 4566eea9ad..85d7b6d5c4 100644
--- a/gm/strokefill.cpp
+++ b/gm/strokefill.cpp
@@ -23,11 +23,11 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("stroke-fill");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 480);
}
@@ -39,7 +39,7 @@ protected:
canvas->drawText(text, len, x, y + SkIntToScalar(120), p);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkScalar x = SkIntToScalar(100);
SkScalar y = SkIntToScalar(88);
diff --git a/gm/strokerect.cpp b/gm/strokerect.cpp
index 9c86aec642..4d0353f28c 100644
--- a/gm/strokerect.cpp
+++ b/gm/strokerect.cpp
@@ -50,15 +50,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("strokerect");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(1024, 740);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->drawColor(SK_ColorWHITE);
canvas->translate(STROKE_WIDTH*3/2, STROKE_WIDTH*3/2);
diff --git a/gm/strokerects.cpp b/gm/strokerects.cpp
index 65eadd1a90..2a187b7544 100644
--- a/gm/strokerects.cpp
+++ b/gm/strokerects.cpp
@@ -29,11 +29,11 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("strokerects");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(W*2, H*2);
}
@@ -49,7 +49,7 @@ protected:
r->offset(-w/2 + woffset, -h/2 + hoffset);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
diff --git a/gm/strokes.cpp b/gm/strokes.cpp
index 2a92c031ae..0a8f121b49 100644
--- a/gm/strokes.cpp
+++ b/gm/strokes.cpp
@@ -43,15 +43,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("strokes_round");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(W, H*2);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(SkIntToScalar(9)/2);
@@ -99,11 +99,11 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("strokes_poly");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(W, H*2);
}
@@ -113,7 +113,7 @@ protected:
canvas->concat(matrix);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->drawColor(SK_ColorWHITE);
SkPaint paint;
@@ -200,15 +200,15 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("strokes3");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(W, H*2);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint origPaint;
origPaint.setAntiAlias(true);
origPaint.setStyle(SkPaint::kStroke_Style);
diff --git a/gm/testimagefilters.cpp b/gm/testimagefilters.cpp
index 799b44c017..50df0e6aef 100644
--- a/gm/testimagefilters.cpp
+++ b/gm/testimagefilters.cpp
@@ -97,7 +97,7 @@ public:
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("testimagefilters");
}
@@ -105,9 +105,9 @@ protected:
return kSkipTiled_Flag;
}
- virtual SkISize onISize() { return SkISize::Make(700, 460); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 460); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
// this->drawSizeBounds(canvas, 0xFFCCCCCC);
static SkImageFilter* (*gFilterProc[])() = {
diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index b8c2431c9b..379898a741 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -27,17 +27,17 @@ public:
}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("texdata");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(2*S, 2*S);
}
virtual uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
GrRenderTarget* target = canvas->internal_private_accessTopLayerRenderTarget();
GrContext* ctx = canvas->getGrContext();
if (ctx && target) {
diff --git a/gm/tiledscaledbitmap.cpp b/gm/tiledscaledbitmap.cpp
index 3ea110c44f..4bf3b824eb 100644
--- a/gm/tiledscaledbitmap.cpp
+++ b/gm/tiledscaledbitmap.cpp
@@ -31,11 +31,11 @@ public:
}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("tiledscaledbitmap");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(1016, 616);
}
@@ -43,7 +43,7 @@ protected:
return kSkipTiled_Flag;
}
- static SkBitmap make_bm(int width, int height) {
+ static SkBitmap make_bm(int width, int height) {
SkBitmap bm;
bm.allocN32Pixels(width, height);
bm.eraseColor(SK_ColorTRANSPARENT);
@@ -51,14 +51,14 @@ protected:
SkPaint paint;
paint.setAntiAlias(true);
canvas.drawCircle(width/2.f, height/2.f, width/4.f, paint);
- return bm;
+ return bm;
}
virtual void onOnceBeforeDraw() SK_OVERRIDE {
fBitmap = make_bm(360, 288);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
index a912cba5e7..33d1b23471 100644
--- a/gm/tilemodes.cpp
+++ b/gm/tilemodes.cpp
@@ -61,7 +61,7 @@ protected:
kNPOTSize = 21,
};
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
SkString name("tilemodes");
if (!fPowerOfTwoSize) {
name.append("_npot");
@@ -69,7 +69,7 @@ protected:
return name;
}
- SkISize onISize() { return SkISize::Make(880, 560); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); }
virtual void onOnceBeforeDraw() SK_OVERRIDE {
int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
@@ -198,13 +198,13 @@ protected:
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return fName;
}
- SkISize onISize() { return SkISize::Make(880, 560); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);
const SkScalar w = SkIntToScalar(gWidth);
diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp
index 93a3db3f90..32f640acaa 100644
--- a/gm/tilemodes_scaled.cpp
+++ b/gm/tilemodes_scaled.cpp
@@ -65,7 +65,7 @@ protected:
kNPOTSize = 3,
};
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
SkString name("scaled_tilemodes");
if (!fPowerOfTwoSize) {
name.append("_npot");
@@ -80,7 +80,7 @@ protected:
}
#endif
- SkISize onISize() { return SkISize::Make(880, 760); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 760); }
virtual void onOnceBeforeDraw() SK_OVERRIDE {
int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
@@ -90,7 +90,6 @@ protected:
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-
float scale = 32.f/kPOTSize;
int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
@@ -218,13 +217,13 @@ protected:
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return fName;
}
- SkISize onISize() { return SkISize::Make(880, 560); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);
const SkScalar w = SkIntToScalar(gWidth);
diff --git a/gm/verttext.cpp b/gm/verttext.cpp
index 944a6db876..0804e09110 100644
--- a/gm/verttext.cpp
+++ b/gm/verttext.cpp
@@ -53,11 +53,11 @@ protected:
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return SkString("verttext");
}
- SkISize onISize() { return SkISize::Make(640, 480); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); }
static void drawBaseline(SkCanvas* canvas, const SkPaint& paint,
SkScalar x, SkScalar y) {
@@ -85,7 +85,7 @@ protected:
canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkScalar x = SkIntToScalar(100);
SkScalar y = SkIntToScalar(50);
diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp
index 0ccdec19ca..5067bbb745 100644
--- a/gm/verttext2.cpp
+++ b/gm/verttext2.cpp
@@ -36,14 +36,13 @@ protected:
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return SkString("verttext2");
}
- SkISize onISize() { return SkISize::Make(640, 480); }
-
- virtual void onDraw(SkCanvas* canvas) {
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); }
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
for (int i = 0; i < 3; ++i) {
SkPaint paint;
paint.setColor(SK_ColorRED);
diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp
index d881ae1e6d..c8fc1ba876 100644
--- a/gm/xfermodes.cpp
+++ b/gm/xfermodes.cpp
@@ -168,15 +168,15 @@ public:
XfermodesGM() {}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("xfermodes");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(1990, 640);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->translate(SkIntToScalar(10), SkIntToScalar(20));
const struct {
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 14:12:41 +0000