| Index: include/utils/SkProxyCanvas.h
|
| diff --git a/include/utils/SkProxyCanvas.h b/include/utils/SkProxyCanvas.h
|
| index 2a2d7746f5a4a6008855ef7f658f656702c18563..ac1ba990873cbc94143fd75cb284c29f02385b08 100644
|
| --- a/include/utils/SkProxyCanvas.h
|
| +++ b/include/utils/SkProxyCanvas.h
|
| @@ -26,21 +26,21 @@ public:
|
| SkCanvas* getProxy() const { return fProxy; }
|
| void setProxy(SkCanvas* proxy);
|
|
|
| - 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;
|
|
|
| - virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE;
|
| + SkDrawFilter* setDrawFilter(SkDrawFilter* filter) 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[],
|
| @@ -76,12 +76,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;
|
|
|
| private:
|
| SkCanvas* fProxy;
|
|
|