diff options
| author |  junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-24 20:44:56 +0000 |
|---|---|---|
| committer | junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-24 20:44:56 +0000 |
| commit | 0b5b0ce39cea3e0eb83c70278b40fa52b3c5870d (patch) | |
| tree | 1336d617b93b5d4da007fe700befbd893cf522cb /include | |
| parent | d127ffe92cb5e6d026da82c837ba723552d51827 (diff) | |
reverting r3257 because of gm failure.
git-svn-id: http://skia.googlecode.com/svn/trunk@3258 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkCanvas.h | 9 | ||||
| -rw-r--r-- | include/utils/SkDeferredCanvas.h | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 9445f1736a..058979d0f7 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -283,7 +283,7 @@ public: /** Returns the number of matrix/clip states on the SkCanvas' private stack. This will equal # save() calls - # restore() calls. */ - int getSaveCount() const; + virtual int getSaveCount() const; /** Efficient way to pop any calls to save() that happened after the save count reached saveCount. It is an error for saveCount to be less than @@ -850,7 +850,7 @@ public: This does not account for the translate in any of the devices. @return The current matrix on the canvas. */ - const SkMatrix& getTotalMatrix() const; + virtual const SkMatrix& getTotalMatrix() const; enum ClipType { kEmpty_ClipType = 0, @@ -936,11 +936,6 @@ protected: virtual void commonDrawBitmap(const SkBitmap&, const SkIRect*, const SkMatrix&, const SkPaint& paint); - // Clip rectangle bounds. Used internally by saveLayer. - // returns false if the entire rectangle is clipped out - bool clipRectBounds(const SkRect* bounds, SaveFlags flags, - SkIRect* intersection); - private: class MCRec; diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h index 87797ac4ca..e06ea81cbc 100644 --- a/include/utils/SkDeferredCanvas.h +++ b/include/utils/SkDeferredCanvas.h @@ -80,13 +80,14 @@ public: virtual int saveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags) SK_OVERRIDE; virtual void restore() SK_OVERRIDE; - virtual bool isDrawingToLayer() const SK_OVERRIDE; + virtual int getSaveCount() const SK_OVERRIDE; virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE; virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE; virtual bool rotate(SkScalar degrees) SK_OVERRIDE; virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE; virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE; virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE; + virtual const SkMatrix& getTotalMatrix() const SK_OVERRIDE; virtual bool clipRect(const SkRect& rect, SkRegion::Op op, bool doAntiAlias) SK_OVERRIDE; virtual bool clipPath(const SkPath& path, SkRegion::Op op, |