diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /include/gpu/effects | |
| parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) | |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'include/gpu/effects')
| -rw-r--r-- | include/gpu/effects/GrCoverageSetOpXP.h | 12 | ||||
| -rw-r--r-- | include/gpu/effects/GrPorterDuffXferProcessor.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/gpu/effects/GrCoverageSetOpXP.h b/include/gpu/effects/GrCoverageSetOpXP.h index 9435b845d4..64002d5b97 100644 --- a/include/gpu/effects/GrCoverageSetOpXP.h +++ b/include/gpu/effects/GrCoverageSetOpXP.h @@ -24,14 +24,14 @@ public: static GrXPFactory* Create(SkRegion::Op regionOp, bool invertCoverage = false); bool supportsRGBCoverage(GrColor /*knownColor*/, - uint32_t /*knownColorFlags*/) const SK_OVERRIDE { + uint32_t /*knownColorFlags*/) const override { return true; } - bool canTweakAlphaForCoverage() const SK_OVERRIDE { return false; } + bool canTweakAlphaForCoverage() const override { return false; } void getInvariantOutput(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - GrXPFactory::InvariantOutput*) const SK_OVERRIDE; + GrXPFactory::InvariantOutput*) const override; private: GrCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage); @@ -39,15 +39,15 @@ private: GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - const GrDeviceCoordTexture* dstCopy) const SK_OVERRIDE; + const GrDeviceCoordTexture* dstCopy) const override; bool willReadDstColor(const GrDrawTargetCaps& /*caps*/, const GrProcOptInfo& /*colorPOI*/, - const GrProcOptInfo& /*coveragePOI*/) const SK_OVERRIDE { + const GrProcOptInfo& /*coveragePOI*/) const override { return false; } - bool onIsEqual(const GrXPFactory& xpfBase) const SK_OVERRIDE { + bool onIsEqual(const GrXPFactory& xpfBase) const override { const GrCoverageSetOpXPFactory& xpf = xpfBase.cast<GrCoverageSetOpXPFactory>(); return fRegionOp == xpf.fRegionOp; } diff --git a/include/gpu/effects/GrPorterDuffXferProcessor.h b/include/gpu/effects/GrPorterDuffXferProcessor.h index 3bcdf0edff..65d7a723f6 100644 --- a/include/gpu/effects/GrPorterDuffXferProcessor.h +++ b/include/gpu/effects/GrPorterDuffXferProcessor.h @@ -18,12 +18,12 @@ class GrPorterDuffXPFactory : public GrXPFactory { public: static GrXPFactory* Create(SkXfermode::Mode mode); - bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const SK_OVERRIDE; + bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const override; - bool canTweakAlphaForCoverage() const SK_OVERRIDE; + bool canTweakAlphaForCoverage() const override; void getInvariantOutput(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - GrXPFactory::InvariantOutput*) const SK_OVERRIDE; + GrXPFactory::InvariantOutput*) const override; private: GrPorterDuffXPFactory(GrBlendCoeff src, GrBlendCoeff dst); @@ -31,13 +31,13 @@ private: GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - const GrDeviceCoordTexture* dstCopy) const SK_OVERRIDE; + const GrDeviceCoordTexture* dstCopy) const override; bool willReadDstColor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, - const GrProcOptInfo& coveragePOI) const SK_OVERRIDE; + const GrProcOptInfo& coveragePOI) const override; - bool onIsEqual(const GrXPFactory& xpfBase) const SK_OVERRIDE { + bool onIsEqual(const GrXPFactory& xpfBase) const override { const GrPorterDuffXPFactory& xpf = xpfBase.cast<GrPorterDuffXPFactory>(); return (fSrcCoeff == xpf.fSrcCoeff && fDstCoeff == xpf.fDstCoeff); } |