| Index: src/core/SkPictureRecord.h
|
| diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h
|
| index ca2c13329c444d699f6dd309654e1cf68fe33ac0..3ce0007a3cd2814b8e39c875edad92711e07f2c3 100644
|
| --- a/src/core/SkPictureRecord.h
|
| +++ b/src/core/SkPictureRecord.h
|
| @@ -29,9 +29,9 @@ public:
|
| SkPictureRecord(const SkISize& dimensions, uint32_t recordFlags);
|
| virtual ~SkPictureRecord();
|
|
|
| - 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;
|
|
|
| const SkTDArray<const SkPicture* >& getPictureRefs() const {
|
| return fPictureRefs;
|
| @@ -146,19 +146,19 @@ protected:
|
| SkASSERT(fWriter.bytesWritten() == initialOffset + size);
|
| }
|
|
|
| - virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
|
| + SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
|
| const void* onPeekPixels(SkImageInfo*, size_t*) SK_OVERRIDE {
|
| return NULL;
|
| }
|
|
|
| - 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;
|
| @@ -199,12 +199,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;
|
|
|
| int addPathToHeap(const SkPath& path); // does not write to ops stream
|
|
|
|
|