| Index: include/utils/SkDumpCanvas.h
|
| diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h
|
| index d8f50d0521d1b566adb7e5a56cce686f19492f81..c6b20ebca953172cb7b6418d5e16b9f183cde733 100644
|
| --- a/include/utils/SkDumpCanvas.h
|
| +++ b/include/utils/SkDumpCanvas.h
|
| @@ -75,19 +75,19 @@ public:
|
|
|
| int getNestLevel() const { return fNestLevel; }
|
|
|
| - 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:
|
| - 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[],
|
| @@ -123,12 +123,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;
|
|
|
| static const char* EdgeStyleToAAString(ClipEdgeStyle edgeStyle);
|
|
|
|
|