Index: src/utils/debugger/SkDebugCanvas.h |
diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h |
index 4acf8322b957481ed2219ae75ccd837190922d3f..3d9983b5046749106356e98ee760c85a4328b1d4 100644 |
--- a/src/utils/debugger/SkDebugCanvas.h |
+++ b/src/utils/debugger/SkDebugCanvas.h |
@@ -146,16 +146,16 @@ public: |
// Inherited from SkCanvas |
//////////////////////////////////////////////////////////////////////////////// |
- 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; |
static const int kVizImageHeight = 256; |
static const int kVizImageWidth = 256; |
- virtual bool isClipEmpty() const SK_OVERRIDE { return false; } |
- virtual bool isClipRect() const SK_OVERRIDE { return true; } |
- virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { |
+ bool isClipEmpty() const SK_OVERRIDE { return false; } |
+ bool isClipRect() const SK_OVERRIDE { return true; } |
+ bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { |
if (bounds) { |
bounds->setXYWH(0, 0, |
SkIntToScalar(this->imageInfo().width()), |
@@ -163,7 +163,7 @@ public: |
} |
return true; |
} |
- virtual bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE { |
+ bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE { |
if (bounds) { |
bounds->setLargest(); |
} |
@@ -171,14 +171,14 @@ public: |
} |
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[], |
@@ -211,12 +211,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& region, 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& region, 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; |
void markActiveCommands(int index); |