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
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 791511e..011e3c3 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1237,8 +1237,6 @@
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 2e002cc..b340141 100644
--- a/include/utils/SkProxyCanvas.h
+++ b/include/utils/SkProxyCanvas.h
@@ -79,8 +79,6 @@
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:
