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

Unified Diff: src/gpu/gl/GrGLPathProcessor.h

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/gpu/gl/GrGLPath.h ('k') | src/gpu/gl/GrGLPathRange.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLPathProcessor.h
diff --git a/src/gpu/gl/GrGLPathProcessor.h b/src/gpu/gl/GrGLPathProcessor.h
index 368f1f9fcdf611eb0da0ab62fc75b9b8d043f879..0351e7fc826a27e177f46eabfb405c48915955e8 100644
--- a/src/gpu/gl/GrGLPathProcessor.h
+++ b/src/gpu/gl/GrGLPathProcessor.h
@@ -23,7 +23,7 @@ public:
const GrGLCaps&,
GrProcessorKeyBuilder* b);
- void emitCode(EmitArgs&) SK_OVERRIDE;
+ void emitCode(EmitArgs&) override;
virtual void emitTransforms(GrGLGPBuilder*, const TransformsIn&, TransformsOut*) = 0;
@@ -31,7 +31,7 @@ public:
void setData(const GrGLProgramDataManager&,
const GrPrimitiveProcessor&,
- const GrBatchTracker&) SK_OVERRIDE;
+ const GrBatchTracker&) override;
virtual void setTransformData(const GrPrimitiveProcessor&,
int index,
@@ -64,15 +64,15 @@ public:
return firstFreeCoordSet;
}
- void emitTransforms(GrGLGPBuilder*, const TransformsIn& tin, TransformsOut* tout) SK_OVERRIDE;
+ void emitTransforms(GrGLGPBuilder*, const TransformsIn& tin, TransformsOut* tout) override;
void setTransformData(const GrPrimitiveProcessor& primProc,
int index,
const SkTArray<const GrCoordTransform*, true>& transforms,
GrGLPathRendering* glpr,
- GrGLuint) SK_OVERRIDE;
+ GrGLuint) override;
- void didSetData(GrGLPathRendering* glpr) SK_OVERRIDE;
+ void didSetData(GrGLPathRendering* glpr) override;
private:
SkDEBUGCODE(int fMaxTexCoords;)
@@ -86,7 +86,7 @@ public:
GrGLNormalPathProcessor(const GrPathProcessor& pathProc, const GrBatchTracker& bt)
: INHERITED(pathProc, bt) {}
- void emitTransforms(GrGLGPBuilder* pb, const TransformsIn& tin,TransformsOut* tout) SK_OVERRIDE;
+ void emitTransforms(GrGLGPBuilder* pb, const TransformsIn& tin,TransformsOut* tout) override;
void resolveSeparableVaryings(GrGLGpu* gpu, GrGLuint programId);
@@ -94,7 +94,7 @@ public:
int index,
const SkTArray<const GrCoordTransform*, true>& coordTransforms,
GrGLPathRendering* glpr,
- GrGLuint programID) SK_OVERRIDE;
+ GrGLuint programID) override;
private:
struct SeparableVaryingInfo {
« no previous file with comments | « src/gpu/gl/GrGLPath.h ('k') | src/gpu/gl/GrGLPathRange.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698