Index: include/utils/SkNWayCanvas.h |
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h |
index b547fe524ae9d4dedfd9e2115b7a30a5eb83ad59..02d715b50abaa3e019df23e8e55723982af15549 100644 |
--- a/include/utils/SkNWayCanvas.h |
+++ b/include/utils/SkNWayCanvas.h |
@@ -23,23 +23,23 @@ public: |
/////////////////////////////////////////////////////////////////////////// |
// These are forwarded to the N canvases we're referencing |
- virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; |
+ SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; |
- virtual void beginCommentGroup(const char* description) SK_OVERRIDE; |
- virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; |
- virtual void endCommentGroup() SK_OVERRIDE; |
+ void beginCommentGroup(const char* description) SK_OVERRIDE; |
+ void addComment(const char* kywd, const char* value) SK_OVERRIDE; |
+ void endCommentGroup() SK_OVERRIDE; |
protected: |
SkTDArray<SkCanvas*> fList; |
- virtual void willSave() SK_OVERRIDE; |
- virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; |
- virtual void willRestore() SK_OVERRIDE; |
+ void willSave() SK_OVERRIDE; |
+ SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; |
+ void willRestore() SK_OVERRIDE; |
- virtual void didConcat(const SkMatrix&) SK_OVERRIDE; |
- virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; |
+ void didConcat(const SkMatrix&) SK_OVERRIDE; |
+ void didSetMatrix(const SkMatrix&) SK_OVERRIDE; |
- virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; |
+ void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; |
virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, |
const SkPaint&) SK_OVERRIDE; |
virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], |
@@ -75,12 +75,12 @@ protected: |
const uint16_t indices[], int indexCount, |
const SkPaint&) SK_OVERRIDE; |
- virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
- virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
- virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
- virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; |
+ void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
+ void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
+ void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
+ void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; |
- virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; |
+ void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; |
class Iter; |