diff options
| author |  reed <reed@google.com> | 2014-08-11 06:35:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-11 06:35:48 -0700 |
| commit | 872e3dc89d82bbd5884a282640f20e430e2ac1f7 (patch) | |
| tree | 7be4795cceb4864fdb5e2aafab5a9bca8ccb0bbd /include | |
| parent | 6b143b080820c34c9c0f80e5c682939e9ee3879d (diff) | |
Revert of Revert of remove (now unneeded) legacy onDrawPicture variant (https://codereview.chromium.org/457253002/)
Reason for revert:
webkit has been updated, so re-landing
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/47f9bdcc3d741a63935c52bfe85db44ab13f66f2
R=reed@chromium.org
TBR=reed@chromium.org
NOTREECHECKS=true
NOTRY=true
Author: reed@google.com
Review URL: https://codereview.chromium.org/460693002
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkCanvas.h | 2 | ||||
| -rw-r--r-- | include/utils/SkProxyCanvas.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 791511e768..011e3c3a03 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1237,8 +1237,6 @@ 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 2e002ccfc8..b340141d97 100644 --- a/include/utils/SkProxyCanvas.h +++ b/include/utils/SkProxyCanvas.h @@ -79,8 +79,6 @@ 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: |