style nit cleanups. e.g. remove 'virtual' on override declarations
Review URL: https://codereview.chromium.org/1216433005
diff --git a/include/effects/SkBitmapSource.h b/include/effects/SkBitmapSource.h
index 55b5bed..e4281c9 100644
--- a/include/effects/SkBitmapSource.h
+++ b/include/effects/SkBitmapSource.h
@@ -33,8 +33,8 @@
SkFilterQuality filterQuality);
void flatten(SkWriteBuffer&) const override;
- virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* offset) const override;
+ bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+ SkBitmap* result, SkIPoint* offset) const override;
private:
SkBitmap fBitmap;
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index 7d409e8..3a24225 100644
--- a/include/effects/SkMorphologyImageFilter.h
+++ b/include/effects/SkMorphologyImageFilter.h
@@ -60,11 +60,11 @@
return SkNEW_ARGS(SkDilateImageFilter, (radiusX, radiusY, input, cropRect));
}
- virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* offset) const override;
+ bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+ SkBitmap* result, SkIPoint* offset) const override;
#if SK_SUPPORT_GPU
- virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* offset) const override;
+ bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
+ SkBitmap* result, SkIPoint* offset) const override;
#endif
SK_TO_STRING_OVERRIDE()
@@ -88,11 +88,11 @@
return SkNEW_ARGS(SkErodeImageFilter, (radiusX, radiusY, input, cropRect));
}
- virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* offset) const override;
+ bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+ SkBitmap* result, SkIPoint* offset) const override;
#if SK_SUPPORT_GPU
- virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* offset) const override;
+ bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
+ SkBitmap* result, SkIPoint* offset) const override;
#endif
SK_TO_STRING_OVERRIDE()
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h
index 2115ee4..30a3a5c 100644
--- a/include/effects/SkXfermodeImageFilter.h
+++ b/include/effects/SkXfermodeImageFilter.h
@@ -33,15 +33,15 @@
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter)
- virtual bool onFilterImage(Proxy* proxy,
- const SkBitmap& src,
- const Context& ctx,
- SkBitmap* dst,
- SkIPoint* offset) const override;
+ bool onFilterImage(Proxy* proxy,
+ const SkBitmap& src,
+ const Context& ctx,
+ SkBitmap* dst,
+ SkIPoint* offset) const override;
#if SK_SUPPORT_GPU
bool canFilterImageGPU() const override;
- virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
- SkBitmap* result, SkIPoint* offset) const override;
+ bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
+ SkBitmap* result, SkIPoint* offset) const override;
#endif
protected:
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 1f1ebc2..f576474 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -174,7 +174,7 @@
* Callers should take a ref if they rely on the GrDrawContext sticking around.
* NULL will be returned if the context has been abandoned.
*
- * @param devProps the device properties (mainly defines text drawing)
+ * @param surfaceProps the surface properties (mainly defines text drawing)
*
* @return a draw context
*/
diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h
index 918e19e..24e3e8d 100644
--- a/src/core/SkColorShader.h
+++ b/src/core/SkColorShader.h
@@ -54,9 +54,9 @@
GradientType asAGradient(GradientInfo* info) const override;
- virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
- const SkMatrix*, GrColor*,
- GrFragmentProcessor**) const override;
+ bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
+ const SkMatrix*, GrColor*,
+ GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader)
diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h
index 6a3a244..596b2ac 100644
--- a/src/core/SkXfermode_proccoeff.h
+++ b/src/core/SkXfermode_proccoeff.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
#ifndef SkXfermode_proccoeff_DEFINED
#define SkXfermode_proccoeff_DEFINED
@@ -23,12 +30,12 @@
fDstCoeff = rec.fDC;
}
- virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
- const SkAlpha aa[]) const override;
- virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
- const SkAlpha aa[]) const override;
- virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
- const SkAlpha aa[]) const override;
+ void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
+ const SkAlpha aa[]) const override;
+ void xfer16(uint16_t dst[], const SkPMColor src[], int count,
+ const SkAlpha aa[]) const override;
+ void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
+ const SkAlpha aa[]) const override;
bool asMode(Mode* mode) const override;
@@ -37,10 +44,9 @@
bool isOpaque(SkXfermode::SrcColorOpacity opacityType) const override;
#if SK_SUPPORT_GPU
- virtual bool asFragmentProcessor(GrFragmentProcessor**,
- GrTexture* background) const override;
+ bool asFragmentProcessor(GrFragmentProcessor**, GrTexture* background) const override;
- virtual bool asXPFactory(GrXPFactory**) const override;
+ bool asXPFactory(GrXPFactory**) const override;
#endif
SK_TO_STRING_OVERRIDE()
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
index fe8887f..82f6ea4 100644
--- a/src/effects/SkAlphaThresholdFilter.cpp
+++ b/src/effects/SkAlphaThresholdFilter.cpp
@@ -25,11 +25,11 @@
protected:
void flatten(SkWriteBuffer&) const override;
- virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* offset) const override;
+ bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+ SkBitmap* result, SkIPoint* offset) const override;
#if SK_SUPPORT_GPU
- virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
- const SkIRect& bounds) const override;
+ bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
+ const SkIRect& bounds) const override;
#endif
private:
diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h
index 3f4f36f..63a4315 100644
--- a/src/effects/gradients/SkLinearGradient.h
+++ b/src/effects/gradients/SkLinearGradient.h
@@ -30,9 +30,8 @@
BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const override;
GradientType asAGradient(GradientInfo* info) const override;
- virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
- const SkMatrix*,
- GrColor*, GrFragmentProcessor**) const override;
+ bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
+ const SkMatrix*, GrColor*, GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLinearGradient)
diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h
index f80a8e8..748f684 100644
--- a/src/effects/gradients/SkRadialGradient.h
+++ b/src/effects/gradients/SkRadialGradient.h
@@ -28,13 +28,11 @@
typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
};
- virtual BitmapType asABitmap(SkBitmap* bitmap,
- SkMatrix* matrix,
- TileMode* xy) const override;
+ BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy) const override;
GradientType asAGradient(GradientInfo* info) const override;
- virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
- const SkMatrix*, GrColor*,
- GrFragmentProcessor**) const override;
+ bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
+ const SkMatrix*, GrColor*,
+ GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRadialGradient)
@@ -45,10 +43,11 @@
Context* onCreateContext(const ContextRec&, void* storage) const override;
private:
- friend class SkGradientShader;
- typedef SkGradientShaderBase INHERITED;
const SkPoint fCenter;
const SkScalar fRadius;
+
+ friend class SkGradientShader;
+ typedef SkGradientShaderBase INHERITED;
};
#endif
diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h
index 7e08d97..1edc968 100644
--- a/src/effects/gradients/SkSweepGradient.h
+++ b/src/effects/gradients/SkSweepGradient.h
@@ -28,15 +28,13 @@
typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
};
- virtual BitmapType asABitmap(SkBitmap* bitmap,
- SkMatrix* matrix,
- TileMode* xy) const override;
+ BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy) const override;
GradientType asAGradient(GradientInfo* info) const override;
- virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
- const SkMatrix*, GrColor*,
- GrFragmentProcessor**) const override;
+ bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
+ const SkMatrix*, GrColor*,
+ GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient)
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h
index 0a3cd90..8ff0048 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.h
+++ b/src/effects/gradients/SkTwoPointConicalGradient.h
@@ -58,12 +58,10 @@
typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
};
- virtual BitmapType asABitmap(SkBitmap* bitmap,
- SkMatrix* matrix,
- TileMode* xy) const override;
+ BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy) const override;
SkShader::GradientType asAGradient(GradientInfo* info) const override;
- virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
- GrColor*, GrFragmentProcessor**) const override;
+ bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
+ GrColor*, GrFragmentProcessor**) const override;
bool isOpaque() const override;
SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); }