diff options
| author |  reed <reed@chromium.org> | 2014-08-10 19:04:01 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-10 19:04:01 -0700 |
| commit | 47f9bdcc3d741a63935c52bfe85db44ab13f66f2 (patch) | |
| tree | 078a63927a692cd362a1b21b0d42b3d6e9fd3e31 /include | |
| parent | 2e69d292e5a389db7d9264eb66172376692de8ca (diff) | |
Revert of remove (now unneeded) legacy onDrawPicture variant (https://codereview.chromium.org/456203002/)
Reason for revert:
still need to update ProfilingCanvas in blink
Original issue's description:
> remove (now unneeded) legacy onDrawPicture variant
>
> TBR=fmalita@google.com
>
> Committed: https://skia.googlesource.com/skia/+/2e69d292e5a389db7d9264eb66172376692de8ca
TBR=
NOTREECHECKS=true
NOTRY=true
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/457253002
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkCanvas.h | 2 | ||||
| -rw-r--r-- | include/utils/SkProxyCanvas.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 011e3c3a03..791511e768 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1237,6 +1237,8 @@ protected: virtual void onDiscard(); + // temporary, until we can migrate existing overrides in chrome + virtual void onDrawPicture(const SkPicture*) {} virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*); // Returns the canvas to be used by DrawIter. Default implementation diff --git a/include/utils/SkProxyCanvas.h b/include/utils/SkProxyCanvas.h index b340141d97..2e002ccfc8 100644 --- a/include/utils/SkProxyCanvas.h +++ b/include/utils/SkProxyCanvas.h @@ -79,6 +79,8 @@ protected: virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + // temporary until we can land and fix chrome + virtual void onDrawPicture(const SkPicture*) SK_OVERRIDE {} virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; private: |