return fName.c_str();
}
- virtual void onPreDraw() {
+ virtual void onPreDraw() SK_OVERRIDE {
SkImageInfo info = SkImageInfo::Make(W, H, fColorType, kUnpremul_SkAlphaType);
fBmp1.allocPixels(info); // used in writePixels
protected:
- virtual const char* onGetName() {
+ virtual const char* onGetName() SK_OVERRIDE {
return "rectori";
}
}
protected:
- virtual const char* onGetName() {
+ virtual const char* onGetName() SK_OVERRIDE {
return "ref_cnt_heap_weak";
}
- virtual void onDraw(const int loops, SkCanvas*) {
+ virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
char memory[sizeof(PlacedWeakRefCnt)];
for (int i = 0; i < loops; ++i) {
PlacedWeakRefCnt* ref = new (memory) PlacedWeakRefCnt();
}
protected:
- virtual const char* onGetName() {
+ virtual const char* onGetName() SK_OVERRIDE {
return "ref_cnt_new_weak";
}
- virtual void onDraw(const int loops, SkCanvas*) {
+ virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
for (int i = 0; i < loops; ++i) {
SkWeakRefCnt* ref = new SkWeakRefCnt();
for (int j = 0; j < M; ++j) {
}
protected:
- virtual const char* onGetName() { return fName.c_str(); }
+ virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); }
- virtual void onDraw(const int loops, SkCanvas*) {
+ virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
Proc proc = fProc;
for (int i = 0; i < loops; ++i) {
return fName.c_str();
}
- virtual void onDraw(const int loops, SkCanvas* canvas) {
+ virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
for (int i = 0; i < loops; i++) {
this->performTest();
}
}
}
protected:
- virtual int mulLoopCount() const { return 1; }
+ virtual int mulLoopCount() const SK_OVERRIDE { return 1; }
virtual void performTest() SK_OVERRIDE {
int sum = 0;
for (size_t i = 0; i < ARRAY_N; ++i) {
draw_rect_tests(canvas);
}
- virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; }
+ virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
private:
typedef skiagm::GM INHERITED;
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("aarectmodes");
}
- virtual SkISize onISize() { return SkISize::Make(640, 480); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
if (false) { // avoid bit rot, suppress warning
test4(canvas);
}
}
}
- virtual uint32_t onGetFlags() const { return kSkipPipe_Flag | kSkipTiled_Flag; }
+ virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; }
private:
typedef skiagm::GM INHERITED;
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("beziers");
}
- 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);
}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("bitmaprecttest");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(320, 240);
}
}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("bitmapscroll");
}
return kSkipTiled_Flag;
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(800, 600);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
this->init();
SkIRect scrollCenterRegion = SkIRect::MakeXYWH(
quarterWidth, quarterHeight, quarterWidth*2+1, quarterHeight*2+1);
}
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return fName;
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(860, 820);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->translate(STROKE_WIDTH*3/2, STROKE_WIDTH*3/2);
SkRect r = { 0, 0, 100, 50 };
}
}
- virtual uint32_t onGetFlags() const { return kSkipPipe_Flag | kSkipTiled_Flag; }
+ virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; }
private:
void drawProcs(SkCanvas* canvas, const SkRect& r, const SkPaint& paint,
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("blurs");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(700, 500);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkBlurStyle NONE = SkBlurStyle(-999);
static const struct {
SkBlurStyle fStyle;
return kSkipTiled_Flag | kAsBench_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("circular-clips");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(800, 600);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkRegion::Op ops[] = {
SkRegion::kDifference_Op,
SkRegion::kIntersect_Op,
canvas->drawRect(rect2, p);
}
- virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; }
+ virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
private:
typedef skiagm::GM INHERITED;
fTypeface = SkTypeface::CreateFromStream(stream);
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("coloremoji");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(650, 480);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->drawColor(SK_ColorGRAY);
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("filltypes");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(835, 840);
}
void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
SkScalar scale, const SkPaint& paint) {
-
const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) };
canvas->save();
scale, paint);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
this->makePath();
canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("filltypespersp");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(835, 840);
}
void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
SkScalar scale, const SkPaint& paint) {
-
const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) };
canvas->save();
}
void showFour(SkCanvas* canvas, SkScalar scale, bool aa) {
-
SkPaint paint;
SkPoint center = SkPoint::Make(SkIntToScalar(100), SkIntToScalar(100));
SkColor colors[] = {SK_ColorBLUE, SK_ColorRED, SK_ColorGREEN};
scale, paint);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
this->makePath();
// do perspective drawPaint as the background;
}
class FilterBitmapGM : public skiagm::GM {
- void onOnceBeforeDraw() {
+ void onOnceBeforeDraw() SK_OVERRIDE {
this->makeBitmap();
}
class FilterIndiaBoxGM : public skiagm::GM {
- void onOnceBeforeDraw() {
+ void onOnceBeforeDraw() SK_OVERRIDE {
this->makeBitmap();
SkScalar cx = SkScalarHalf(fBM.width());
}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return fName;
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(1536, 768);
}
}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("fontmgr_match");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 1024);
}
for (int i = 0; str[i]; ++i) {
canvas->drawText(&str[i], 1, x, y, paint);
}
-
+
SkRect r = paint.getFontBounds();
r.offset(x, y);
SkPaint p(paint);
}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return fName;
}
-
- virtual SkISize onISize() {
+
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(1024, 850);
}
-
+
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("fontscaler");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(1450, 750);
}
canvas->translate(-px, -py);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
return kSkipTiled_Flag;
}
- SkString onShortName() {
+ SkString onShortName() SK_OVERRIDE {
return SkString("getpostextpath");
}
- SkISize onISize() { return SkISize::Make(480, 780); }
+ SkISize onISize() SK_OVERRIDE { return SkISize::Make(480, 780); }
static void strokePath(SkCanvas* canvas, const SkPath& path) {
SkPaint paint;
canvas->drawPath(path, paint);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
// explicitly add spaces, to test a prev. bug
const char* text = "Ham bur ge fons";
int len = SkToInt(strlen(text));
#endif
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
SkString str("giantbitmap_");
switch (fMode) {
case SkShader::kClamp_TileMode:
return str;
}
- virtual SkISize onISize() { return SkISize::Make(640, 480); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
SkMatrix m;
return str;
}
- virtual SkISize onISize() { return SkISize::Make(800, 600); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); }
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
if (!fProp) {
return SkString("glyph_pos_align");
}
- virtual SkISize onISize() { return SkISize::Make(kWidth, kHeight); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(kWidth, kHeight); }
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->clear(SK_ColorBLACK);
return kSkipTiled_Flag;
}
- SkString onShortName() { return SkString("radial_gradient"); }
- virtual SkISize onISize() { return SkISize::Make(1280, 1280); }
+ SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient"); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 1280); }
void drawBG(SkCanvas* canvas) {
canvas->drawColor(0xFF000000);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
const SkISize dim = this->getISize();
this->drawBG(canvas);
return kSkipTiled_Flag;
}
- SkString onShortName() { return SkString("radial_gradient2"); }
- virtual SkISize onISize() { return SkISize::Make(800, 400); }
+ SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient2"); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 400); }
void drawBG(SkCanvas* canvas) {
canvas->drawColor(0xFF000000);
}
// Reproduces the example given in bug 7671058.
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint1, paint2, paint3;
paint1.setStyle(SkPaint::kFill_Style);
paint2.setStyle(SkPaint::kFill_Style);
GradTextGM () {}
protected:
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("gradtext");
}
return SkString("hairlines");
}
- virtual SkISize onISize() { return SkISize::Make(1250, 1250); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1250, 1250); }
virtual void onOnceBeforeDraw() SK_OVERRIDE {
{
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("hittestpath");
}
- 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 {
SkPath path;
SkRandom rand;
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 {
SkPaint paint;
paint.setImageFilter(SkBlurImageFilter::Create(fSigmaX, fSigmaY))->unref();
canvas->saveLayer(NULL, &paint);
return kSkipTiled_Flag;
}
- virtual SkString onShortName() {
+ virtual SkString onShortName() SK_OVERRIDE {
return SkString("imagefiltersclipped");
}
- virtual SkISize onISize() {
+ virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(860, 500);
}
canvas.drawCircle(x, y, radius, paint);
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
if (!fInitialized) {
this->make_checkerboard();
this->make_gradient_circle(64, 64);
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Regions");
return true;
canvas->drawPath(path, paint);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
if (false) { // avoid bit rot, suppress warning
test_strokerect(canvas);
return;
SkScalarRoundToInt(y)) ? new Click(this) : NULL;
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
fRect.offset(click->fICurr.fX - click->fIPrev.fX,
click->fICurr.fY - click->fIPrev.fY);
this->inval(NULL);
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "RepeatTile");
return true;
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
make_paint(&paint, SkShader::kRepeat_TileMode);
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
canvas->drawBitmap(bm, 0, 0, NULL);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkScalar radius = 256;
canvas->translate(10, 10);
return this->INHERITED::onQuery(evt);
}
- virtual void onSizeChange() {
+ virtual void onSizeChange() SK_OVERRIDE {
fErrorControl.setXYWH(this->width() - 100, 30, 30, 400);
fWidthControl.setXYWH(this->width() - 50, 30, 30, 400);
fCubicButton.fBounds.setXYWH(this->width() - 50, 450, 30, 30);
canvas->drawText(name, strlen(name), bounds.fLeft, bounds.bottom() + 11, paint);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPath path;
SkScalar width = fWidth;
return (SkIntToScalar(y) - control.fTop) / control.height() * (max - min) + min;
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
int index = ((MyClick*)click)->fIndex;
if (index < (int) SK_ARRAY_COUNT(fPts)) {
fPts[index].offset(SkIntToScalar(click->fICurr.fX - click->fIPrev.fX),
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Shaders");
return true;
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
canvas->drawBitmap(fBitmap, 0, 0);
canvas->translate(SkIntToScalar(20), SkIntToScalar(120));
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Slides");
return true;
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
this->init();
gProc[fIndex](canvas);
}
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "StrokePath");
return true;
}
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
test_huge_stroke(canvas); return;
canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Text");
return true;
pts[i].set(rand->nextUScalar1() * 640, rand->nextUScalar1() * 480);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkAutoCanvasRestore restore(canvas, false);
{
SkRect r;
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "TextAlpha");
return true;
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
const char* str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
SkPaint paint;
SkScalar x = SkIntToScalar(10);
return new Click(this);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
int y = click->fICurr.fY;
if (y < 0) {
y = 0;
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Text On Path");
return true;
return this->INHERITED::onQuery(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
paint.setTextSize(SkIntToScalar(48));
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
return this->INHERITED::onClick(click);
}
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) {
+ virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Vertices");
return true;
SkScalar fScale;
- virtual void onDrawContent(SkCanvas* canvas) {
+ virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setDither(true);
paint.setFilterLevel(SkPaint::kLow_FilterLevel);
return new Click(this);
}
- virtual bool onClick(Click* click) {
+ virtual bool onClick(Click* click) SK_OVERRIDE {
// fCurrX = click->fICurr.fX;
// fCurrY = click->fICurr.fY;
this->inval(NULL);
DECLARE_DISPLAY_MEMBER_INFO(Math);
virtual void executeFunction(SkDisplayable* , int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* );
- virtual const SkFunctionParamType* getFunctionsParameters();
- virtual bool getProperty(int index, SkScriptValue* value) const;
+ SkScriptValue* ) SK_OVERRIDE;
+ virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
private:
mutable SkRandom fRandom;
static const SkScalar gConstants[];
DECLARE_MEMBER_INFO(3D_Camera);
Sk3D_Camera();
virtual ~Sk3D_Camera();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkScalar hackWidth;
SkScalar hackHeight;
private:
virtual void executeFunction(SkDisplayable* , int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* );
- virtual const SkFunctionParamType* getFunctionsParameters();
+ SkScriptValue* ) SK_OVERRIDE;
+ virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
SkPatch3D fPatch;
static const SkFunctionParamType fFunctionParameters[];
friend class Sk3D_Camera;
class SkDrawClip : public SkADrawable {
DECLARE_DRAW_MEMBER_INFO(Clip);
SkDrawClip();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkDrawRect* rect;
SkDrawPath* path;
DECLARE_MEMBER_INFO(Dash);
SkDash();
virtual ~SkDash();
- virtual SkPathEffect* getPathEffect();
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
private:
SkTDScalarArray intervals;
SkScalar phase;
class SkDiscrete : public SkDrawPathEffect {
DECLARE_MEMBER_INFO(Discrete);
SkDiscrete();
- virtual SkPathEffect* getPathEffect();
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
private:
SkScalar deviation;
SkScalar segLength;
SkDrawShapePathEffect();
virtual ~SkDrawShapePathEffect();
virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
- virtual SkPathEffect* getPathEffect();
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
protected:
SkADrawable* addPath;
SkADrawable* addMatrix;
DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape1DPathEffect);
SkDrawShape1DPathEffect(SkDisplayTypes );
virtual ~SkDrawShape1DPathEffect();
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkString phase;
SkString spacing;
DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape2DPathEffect);
SkDrawShape2DPathEffect(SkDisplayTypes );
virtual ~SkDrawShape2DPathEffect();
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkDrawMatrix* matrix;
friend class SkShape2DPathEffect;
SkDrawComposePathEffect(SkDisplayTypes );
virtual ~SkDrawComposePathEffect();
virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
- virtual SkPathEffect* getPathEffect();
- virtual bool isPaint() const;
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
+ virtual bool isPaint() const SK_OVERRIDE;
private:
SkDrawPathEffect* effect1;
SkDrawPathEffect* effect2;
DECLARE_EXTRAS_MEMBER_INFO(SkDrawCornerPathEffect);
SkDrawCornerPathEffect(SkDisplayTypes );
virtual ~SkDrawCornerPathEffect();
- virtual SkPathEffect* getPathEffect();
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
private:
SkScalar radius;
};
SK_DECLARE_UNFLATTENABLE_OBJECT()
protected:
- virtual SkScalar begin(SkScalar contourLength) const {
+ virtual SkScalar begin(SkScalar contourLength) const SK_OVERRIDE {
SkScriptValue value;
SkAnimatorScript engine(*fMaker, NULL, SkType_Float);
engine.propertyCallBack(GetContourLength, &contourLength);
return value.fOperand.fScalar;
}
- virtual SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const {
+ virtual SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const SK_OVERRIDE {
fMaker->setExtraPropertyCallBack(fDraw->fType, GetDistance, &distance);
SkDrawPath* drawPath = NULL;
if (fDraw->addPath->isPath()) {
class SkFull : public SkBoundable {
DECLARE_EMPTY_MEMBER_INFO(Full);
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
typedef SkBoundable INHERITED;
};
#ifdef SK_DUMP_ENABLED
virtual void dumpRest(SkAnimateMaker*);
#endif
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
protected:
SkTDScalarArray offsets;
SkString unitMapper;
#ifdef SK_DUMP_ENABLED
virtual void dump(SkAnimateMaker*) SK_OVERRIDE;
#endif
- virtual SkShader* getShader();
+ virtual SkShader* getShader() SK_OVERRIDE;
protected:
SkPoint center;
SkScalar radius;
class SkLine : public SkBoundable {
DECLARE_MEMBER_INFO(Line);
SkLine();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkScalar x1;
SkScalar x2;
SkDrawPaint();
virtual ~SkDrawPaint();
virtual bool add(SkAnimateMaker* , SkDisplayable* child);
- virtual SkDisplayable* deepCopy(SkAnimateMaker* );
- virtual bool draw(SkAnimateMaker& );
+ virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
virtual void executeFunction(SkDisplayable* target, int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* );
- virtual const SkFunctionParamType* getFunctionsParameters();
- virtual bool getProperty(int index, SkScriptValue* value) const;
- virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply);
+ SkScriptValue* ) SK_OVERRIDE;
+ virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply) SK_OVERRIDE;
protected:
static const SkFunctionParamType fFunctionParameters[];
void setupPaint(SkPaint* paint) const;
virtual ~SkDrawPath();
virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
bool childHasID() { return SkToBool(fChildHasID); }
- virtual bool childrenNeedDisposing() const;
- virtual void dirty();
- virtual bool draw(SkAnimateMaker& );
- virtual SkDisplayable* getParent() const;
+ virtual bool childrenNeedDisposing() const SK_OVERRIDE;
+ virtual void dirty() SK_OVERRIDE;
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual SkDisplayable* getParent() const SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
SkPath& getPath();
- virtual bool getProperty(int index, SkScriptValue* value) const;
- virtual bool setProperty(int index, SkScriptValue& value);
- virtual void onEndElement(SkAnimateMaker& );
- virtual void setChildHasID();
- virtual bool setParent(SkDisplayable* parent);
- virtual bool isPath() const { return true; }
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ virtual bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual void setChildHasID() SK_OVERRIDE;
+ virtual bool setParent(SkDisplayable* parent) SK_OVERRIDE;
+ virtual bool isPath() const SK_OVERRIDE { return true; }
public:
SkPath fPath;
protected:
class SkPolyline : public SkDrawPath {
DECLARE_MEMBER_INFO(Polyline);
virtual bool addChild(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE;
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
protected:
SkTDScalarArray points;
private:
class SkPolygon : public SkPolyline {
DECLARE_MEMBER_INFO(Polygon);
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
typedef SkPolyline INHERITED;
};
class SkDrawPoint : public SkDisplayable {
DECLARE_MEMBER_INFO(DrawPoint);
SkDrawPoint();
- virtual void getBounds(SkRect* );
+ virtual void getBounds(SkRect* ) SK_OVERRIDE;
private:
SkPoint fPoint;
typedef SkDisplayable INHERITED;
DECLARE_MEMBER_INFO(SaveLayer);
SkSaveLayer();
virtual ~SkSaveLayer();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
protected:
SkDrawPaint* paint;
SkDrawRect* bounds;
class SkDrawBitmapShader : public SkDrawShader {
DECLARE_DRAW_MEMBER_INFO(BitmapShader);
SkDrawBitmapShader();
- virtual bool add();
- virtual SkShader* getShader();
+ virtual bool add() SK_OVERRIDE;
+ virtual SkShader* getShader() SK_OVERRIDE;
protected:
SkBool filterBitmap;
SkBaseBitmap* image;
DECLARE_MEMBER_INFO(Text);
SkText();
virtual ~SkText();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual bool getProperty(int index, SkScriptValue* value) const ;
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
const char* getText() { return text.c_str(); }
size_t getSize() { return text.size(); }
protected:
SkDrawTextBox();
// overrides
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual bool getProperty(int index, SkScriptValue* value) const;
- virtual bool setProperty(int index, SkScriptValue& );
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
private:
SkString fText;
DECLARE_MEMBER_INFO(DrawTo);
SkDrawTo();
// virtual ~SkDrawTo();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
protected:
SkBool drawOnce;
class SkDrawTransparentShader : public SkDrawShader {
DECLARE_EMPTY_MEMBER_INFO(TransparentShader);
- virtual SkShader* getShader();
+ virtual SkShader* getShader() SK_OVERRIDE;
};
#endif // SkDrawTransparentShader_DEFINED
class SkHitClear : public SkDisplayable {
DECLARE_MEMBER_INFO(HitClear);
- virtual bool enable(SkAnimateMaker& );
- virtual bool hasEnable() const;
+ virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual bool hasEnable() const SK_OVERRIDE;
private:
SkTDDisplayableArray targets;
};
class SkHitTest : public SkADrawable {
DECLARE_MEMBER_INFO(HitTest);
SkHitTest();
- virtual bool draw(SkAnimateMaker& );
- virtual bool enable(SkAnimateMaker& );
- virtual bool hasEnable() const;
- virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual bool hasEnable() const SK_OVERRIDE;
+ virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
private:
SkTDDisplayableArray bullets;
SkTDIntArray hits;
DECLARE_MEMBER_INFO(Rotate);
SkRotate();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkScalar degrees;
SkPoint center;
};
DECLARE_MEMBER_INFO(Scale);
SkScale();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkScalar x;
SkScalar y;
SkPoint center;
DECLARE_MEMBER_INFO(Skew);
SkSkew();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkScalar x;
SkScalar y;
SkPoint center;
DECLARE_MEMBER_INFO(Translate);
SkTranslate();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkScalar x;
SkScalar y;
};
SkFromPath();
virtual ~SkFromPath();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
int32_t mode;
SkScalar offset;
SkDrawPath* path;
SkRectToRect();
virtual ~SkRectToRect();
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+ virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkDrawRect* source;
SkDrawRect* destination;
};
SkPolyToPoly();
virtual ~SkPolyToPoly();
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual void onEndElement(SkAnimateMaker& );
- virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkPolygon* source;
SkPolygon* destination;
};
#define DECLARE_EMPTY_MEMBER_INFO(_type) \
public: \
- virtual SkDisplayTypes getType() const { return SkType_##_type; }
+ virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; }
#define DECLARE_EXTRAS_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- virtual const SkMemberInfo* getMember(int index); \
- virtual const SkMemberInfo* getMember(const char name[]); \
+ virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+ virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
SkDisplayTypes fType; \
- virtual SkDisplayTypes getType() const { return fType; } \
+ virtual SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \
typedef _type BASE_CLASS
#define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \
DECLARE_EMPTY_MEMBER_INFO(MaskFilter);
virtual SkMaskFilter* getMaskFilter();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
};
class SkDrawPathEffect : public SkPaintPart {
DECLARE_EMPTY_MEMBER_INFO(PathEffect);
virtual SkPathEffect* getPathEffect();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
};
class SkDrawShader : public SkPaintPart {
SkDrawShader();
virtual SkShader* getShader();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkMatrix* getMatrix(); // returns NULL if matrix is NULL
SkDrawMatrix* matrix;
int /*SkShader::TileMode*/ tileMode;
DECLARE_DRAW_MEMBER_INFO(Typeface);
SkDrawTypeface();
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker *);
+ virtual void dump(SkAnimateMaker *) SK_OVERRIDE;
#endif
SkTypeface* getTypeface() {
return SkTypeface::CreateFromName(fontName.c_str(), style); }
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkString fontName;
SkTypeface::Style style;
};
class SkMoveTo : public SkPathPart {
DECLARE_MEMBER_INFO(MoveTo);
SkMoveTo();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkScalar x;
SkScalar y;
class SkRMoveTo : public SkMoveTo {
DECLARE_MEMBER_INFO(RMoveTo);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkMoveTo INHERITED;
};
class SkLineTo : public SkPathPart {
DECLARE_MEMBER_INFO(LineTo);
SkLineTo();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkScalar x;
SkScalar y;
class SkRLineTo : public SkLineTo {
DECLARE_MEMBER_INFO(RLineTo);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkLineTo INHERITED;
};
class SkQuadTo : public SkPathPart {
DECLARE_MEMBER_INFO(QuadTo);
SkQuadTo();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkScalar x1;
SkScalar y1;
class SkRQuadTo : public SkQuadTo {
DECLARE_MEMBER_INFO(RQuadTo);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkQuadTo INHERITED;
};
class SkCubicTo : public SkPathPart {
DECLARE_MEMBER_INFO(CubicTo);
SkCubicTo();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkScalar x1;
SkScalar y1;
class SkRCubicTo : public SkCubicTo {
DECLARE_MEMBER_INFO(RCubicTo);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkCubicTo INHERITED;
};
class SkClose : public SkPathPart {
DECLARE_EMPTY_MEMBER_INFO(Close);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
};
class SkAddGeom : public SkPathPart {
class SkAddRect : public SkAddGeom {
DECLARE_MEMBER_INFO(AddRect);
SkAddRect();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkRect fRect;
private:
class SkAddOval : public SkAddRect {
DECLARE_MEMBER_INFO(AddOval);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkAddRect INHERITED;
};
class SkAddCircle : public SkAddGeom {
DECLARE_MEMBER_INFO(AddCircle);
SkAddCircle();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
SkScalar radius;
SkScalar x;
class SkAddRoundRect : public SkAddRect {
DECLARE_MEMBER_INFO(AddRoundRect);
SkAddRoundRect();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
SkScalar rx;
SkScalar ry;
class SkAddPath : public SkPathPart {
DECLARE_MEMBER_INFO(AddPath);
SkAddPath();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkPathPart INHERITED;
SkDrawMatrix* matrix;
class SkSnapshot: public SkADrawable {
DECLARE_MEMBER_INFO(Snapshot);
SkSnapshot();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkString filename;
SkScalar quality;
class SkTextOnPath : public SkBoundable {
DECLARE_MEMBER_INFO(TextOnPath);
SkTextOnPath();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkScalar offset;
SkDrawPath* path;
class SkTextToPath : public SkADrawable {
DECLARE_MEMBER_INFO(TextToPath);
SkTextToPath();
- virtual bool draw(SkAnimateMaker& );
- virtual void onEndElement(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkDrawPaint* paint;
SkDrawPath* path;
results.append("\n");
this->logProgress(results.c_str());
}
- virtual void end() {}
+ virtual void end() SK_OVERRIDE {}
private:
BenchLogger* fLogger;
SkString fCurrentLine;