| Index: src/utils/SkCanvasStack.h
|
| diff --git a/src/utils/SkCanvasStack.h b/src/utils/SkCanvasStack.h
|
| index 028e52604864970ca994f680dcfba607310cbe0d..27bc6bc018ec4349ecdc3d5066c74362029224e3 100644
|
| --- a/src/utils/SkCanvasStack.h
|
| +++ b/src/utils/SkCanvasStack.h
|
| @@ -18,7 +18,7 @@ public:
|
| virtual ~SkCanvasStack();
|
|
|
| void pushCanvas(SkCanvas* canvas, const SkIPoint& origin);
|
| - virtual void removeAll() SK_OVERRIDE;
|
| + void removeAll() SK_OVERRIDE;
|
|
|
| /*
|
| * The following add/remove canvas methods are overrides from SkNWayCanvas
|
| @@ -26,16 +26,16 @@ public:
|
| * can share most of the other implementation of NWay we override those
|
| * methods to be no-ops.
|
| */
|
| - virtual void addCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); }
|
| - virtual void removeCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); }
|
| + void addCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); }
|
| + void removeCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); }
|
|
|
| protected:
|
| - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
|
| + void didSetMatrix(const SkMatrix&) 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;
|
|
|
| private:
|
| void clipToZOrderedBounds();
|
|
|