Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: gm/dashing.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gm/convexpolyeffect.cpp ('k') | gm/dcshader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "gm.h" 8 #include "gm.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkPaint.h" 10 #include "SkPaint.h"
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 }; 396 };
397 397
398 ////////////////////////////////////////////////////////////////////////////// 398 //////////////////////////////////////////////////////////////////////////////
399 399
400 class Dashing5GM : public skiagm::GM { 400 class Dashing5GM : public skiagm::GM {
401 public: 401 public:
402 Dashing5GM(bool doAA) : fDoAA(doAA) {} 402 Dashing5GM(bool doAA) : fDoAA(doAA) {}
403 403
404 protected: 404 protected:
405 405
406 bool runAsBench() const SK_OVERRIDE { return true; } 406 bool runAsBench() const override { return true; }
407 407
408 SkString onShortName() SK_OVERRIDE { 408 SkString onShortName() override {
409 if (fDoAA) { 409 if (fDoAA) {
410 return SkString("dashing5_aa"); 410 return SkString("dashing5_aa");
411 } else { 411 } else {
412 return SkString("dashing5_bw"); 412 return SkString("dashing5_bw");
413 } 413 }
414 } 414 }
415 415
416 SkISize onISize() SK_OVERRIDE { return SkISize::Make(400, 200); } 416 SkISize onISize() override { return SkISize::Make(400, 200); }
417 417
418 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 418 void onDraw(SkCanvas* canvas) override {
419 static const int kOn = 4; 419 static const int kOn = 4;
420 static const int kOff = 4; 420 static const int kOff = 4;
421 static const int kIntervalLength = kOn + kOff; 421 static const int kIntervalLength = kOn + kOff;
422 422
423 static const SkColor gColors[kIntervalLength] = { 423 static const SkColor gColors[kIntervalLength] = {
424 SK_ColorRED, 424 SK_ColorRED,
425 SK_ColorGREEN, 425 SK_ColorGREEN,
426 SK_ColorBLUE, 426 SK_ColorBLUE,
427 SK_ColorCYAN, 427 SK_ColorCYAN,
428 SK_ColorMAGENTA, 428 SK_ColorMAGENTA,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 474
475 ////////////////////////////////////////////////////////////////////////////// 475 //////////////////////////////////////////////////////////////////////////////
476 476
477 DEF_GM(return SkNEW(DashingGM);) 477 DEF_GM(return SkNEW(DashingGM);)
478 DEF_GM(return SkNEW(Dashing2GM);) 478 DEF_GM(return SkNEW(Dashing2GM);)
479 DEF_GM(return SkNEW(Dashing3GM);) 479 DEF_GM(return SkNEW(Dashing3GM);)
480 DEF_GM(return SkNEW(Dashing4GM);) 480 DEF_GM(return SkNEW(Dashing4GM);)
481 DEF_GM(return SkNEW_ARGS(Dashing5GM, (true));) 481 DEF_GM(return SkNEW_ARGS(Dashing5GM, (true));)
482 DEF_GM(return SkNEW_ARGS(Dashing5GM, (false));) 482 DEF_GM(return SkNEW_ARGS(Dashing5GM, (false));)
483 483
OLDNEW
« no previous file with comments | « gm/convexpolyeffect.cpp ('k') | gm/dcshader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698