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

Unified Diff: src/core/SkColorFilter.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, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkBuffer.h ('k') | src/core/SkColorShader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkColorFilter.cpp
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index 45950ad0b5d35a3496685238c8fb83576d504533..8007271a3fe53d5893de1cae30073dec95ed70d5 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -42,18 +42,18 @@ SkColor SkColorFilter::filterColor(SkColor c) const {
class SkComposeColorFilter : public SkColorFilter {
public:
- uint32_t getFlags() const SK_OVERRIDE {
+ uint32_t getFlags() const override {
// Can only claim alphaunchanged and 16bit support if both our proxys do.
return fOuter->getFlags() & fInner->getFlags();
}
- void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const SK_OVERRIDE {
+ void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const override {
fInner->filterSpan(shader, count, result);
fOuter->filterSpan(result, count, result);
}
#ifndef SK_IGNORE_TO_STRING
- void toString(SkString* str) const SK_OVERRIDE {
+ void toString(SkString* str) const override {
SkString outerS, innerS;
fOuter->toString(&outerS);
fInner->toString(&innerS);
@@ -63,7 +63,7 @@ public:
#if SK_SUPPORT_GPU
bool asFragmentProcessors(GrContext* context,
- SkTDArray<GrFragmentProcessor*>* array) const SK_OVERRIDE {
+ SkTDArray<GrFragmentProcessor*>* array) const override {
bool hasFrags = fInner->asFragmentProcessors(context, array);
hasFrags |= fOuter->asFragmentProcessors(context, array);
return hasFrags;
@@ -73,7 +73,7 @@ public:
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeColorFilter)
protected:
- void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
+ void flatten(SkWriteBuffer& buffer) const override {
buffer.writeFlattenable(fOuter);
buffer.writeFlattenable(fInner);
}
@@ -88,7 +88,7 @@ private:
SkASSERT(composedFilterCount <= SK_MAX_COMPOSE_COLORFILTER_COUNT);
}
- int privateComposedFilterCount() const SK_OVERRIDE {
+ int privateComposedFilterCount() const override {
return fComposedFilterCount;
}
« no previous file with comments | « src/core/SkBuffer.h ('k') | src/core/SkColorShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698