Index: src/effects/SkBlurMaskFilter.cpp |
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp |
index 97ae436367bdd33909e177b8f4245864d7ed0ba9..7c534d69e0f9c48e64d025fd45ad198cdc79c58e 100644 |
--- a/src/effects/SkBlurMaskFilter.cpp |
+++ b/src/effects/SkBlurMaskFilter.cpp |
@@ -39,7 +39,7 @@ public: |
SkBlurMaskFilterImpl(SkScalar sigma, SkBlurStyle, uint32_t flags); |
// overrides from SkMaskFilter |
- virtual SkMask::Format getFormat() const SK_OVERRIDE; |
+ SkMask::Format getFormat() const SK_OVERRIDE; |
virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, |
SkIPoint* margin) const SK_OVERRIDE; |
@@ -66,8 +66,8 @@ public: |
bool canOverwriteSrc) const SK_OVERRIDE; |
#endif |
- virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; |
- virtual bool asABlur(BlurRec*) const SK_OVERRIDE; |
+ void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; |
+ bool asABlur(BlurRec*) const SK_OVERRIDE; |
SK_TO_STRING_OVERRIDE() |
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurMaskFilterImpl) |
@@ -102,7 +102,7 @@ private: |
} |
SkBlurMaskFilterImpl(SkReadBuffer&); |
- virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; |
+ void flatten(SkWriteBuffer&) const SK_OVERRIDE; |
SkScalar computeXformedSigma(const SkMatrix& ctm) const { |
bool ignoreTransform = SkToBool(fBlurFlags & SkBlurMaskFilter::kIgnoreTransform_BlurFlag); |
@@ -607,12 +607,12 @@ class GrRectBlurEffect : public GrFragmentProcessor { |
public: |
virtual ~GrRectBlurEffect(); |
- virtual const char* name() const SK_OVERRIDE { return "RectBlur"; } |
+ const char* name() const SK_OVERRIDE { return "RectBlur"; } |
virtual void getGLProcessorKey(const GrGLCaps& caps, |
GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; |
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; |
/** |
* Create a simple filter effect with custom bicubic coefficients. |
@@ -641,9 +641,9 @@ public: |
private: |
GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blur_profile); |
- virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; |
+ bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; |
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; |
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; |
static bool CreateBlurProfileTexture(GrContext *context, float sigma, |
GrTexture **blurProfileTexture); |
@@ -667,7 +667,7 @@ public: |
const TransformedCoordsArray&, |
const TextureSamplerArray&) SK_OVERRIDE; |
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; |
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; |
private: |
typedef GrGLProgramDataManager::UniformHandle UniformHandle; |
@@ -876,7 +876,7 @@ public: |
static GrFragmentProcessor* Create(GrContext* context, float sigma, const SkRRect&); |
virtual ~GrRRectBlurEffect() {}; |
- virtual const char* name() const SK_OVERRIDE { return "GrRRectBlur"; } |
+ const char* name() const SK_OVERRIDE { return "GrRRectBlur"; } |
const SkRRect& getRRect() const { return fRRect; } |
float getSigma() const { return fSigma; } |
@@ -884,14 +884,14 @@ public: |
virtual void getGLProcessorKey(const GrGLCaps& caps, |
GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; |
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; |
private: |
GrRRectBlurEffect(float sigma, const SkRRect&, GrTexture* profileTexture); |
- virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; |
+ bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; |
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; |
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; |
SkRRect fRRect; |
float fSigma; |
@@ -1024,7 +1024,7 @@ public: |
const TransformedCoordsArray&, |
const TextureSamplerArray&) SK_OVERRIDE; |
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; |
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; |
private: |
GrGLProgramDataManager::UniformHandle fProxyRectUniform; |