diff options
| author |  mtklein <mtklein@chromium.org> | 2015-08-19 14:01:42 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-19 14:01:42 -0700 |
| commit | 3a30cc1cbb2f42bcbd0695cb994a5f1a52754a89 (patch) | |
| tree | 9f44fc97a6ffe00f3733c42878653e4380407d7c /src | |
| parent | ab42ec79d5dbf38b81394c55670b495cdf78b243 (diff) | |
Thou shalt use override consistently.
TBR=herb@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1285973006
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/batches/GrDrawPathBatch.h | 6 | ||||
| -rw-r--r-- | src/pdf/SkPDFFontImpl.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/batches/GrDrawPathBatch.h b/src/gpu/batches/GrDrawPathBatch.h index e60a6602f0..e8349d1ac7 100644 --- a/src/gpu/batches/GrDrawPathBatch.h +++ b/src/gpu/batches/GrDrawPathBatch.h @@ -29,11 +29,11 @@ public: return string; } - virtual void getInvariantOutputColor(GrInitInvariantOutput* out) const { + void getInvariantOutputColor(GrInitInvariantOutput* out) const override { fPrimitiveProcessor->getInvariantOutputColor(out); } - virtual void getInvariantOutputCoverage(GrInitInvariantOutput* out) const { + void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override { fPrimitiveProcessor->getInvariantOutputCoverage(out); } @@ -49,7 +49,7 @@ private: this->initClassID<GrDrawPathBatch>(); } - virtual void initBatchTracker(const GrPipelineOptimizations& opts) { + void initBatchTracker(const GrPipelineOptimizations& opts) override { fPrimitiveProcessor->initBatchTracker(this->tracker(), opts); } diff --git a/src/pdf/SkPDFFontImpl.h b/src/pdf/SkPDFFontImpl.h index 6147ad5a48..f6684489b1 100644 --- a/src/pdf/SkPDFFontImpl.h +++ b/src/pdf/SkPDFFontImpl.h @@ -15,8 +15,8 @@ class SkPDFType0Font : public SkPDFFont { public: virtual ~SkPDFType0Font(); - virtual bool multiByteGlyphs() const { return true; } - virtual SkPDFFont* getFontSubset(const SkPDFGlyphSet* usage); + bool multiByteGlyphs() const override { return true; } + SkPDFFont* getFontSubset(const SkPDFGlyphSet* usage) override; #ifdef SK_DEBUG void emitObject(SkWStream*, const SkPDFObjNumMap&, |