diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index d9959ee54d..c8868fc363 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -2484,10 +2484,6 @@ protected: virtual void onDrawEdgeAAQuad(const SkRect& rect, const SkPoint clip[4], QuadAAFlags aaFlags, const SkColor4f& color, SkBlendMode mode); - // DEPRECATED: This is around until Flutter can be updated to use the const SkColor4f& variant. - // Subclasses that extend the SkColor4f function should not extend this. - virtual void onDrawEdgeAAQuad(const SkRect&, const SkPoint[4], QuadAAFlags, - SkColor, SkBlendMode) {} virtual void onDrawEdgeAAImageSet(const ImageSetEntry imageSet[], int count, const SkPoint dstClips[], const SkMatrix preViewMatrices[], const SkPaint* paint, SrcRectConstraint constraint); diff --git a/include/core/SkCanvasVirtualEnforcer.h b/include/core/SkCanvasVirtualEnforcer.h index add5f59a6f..5911f383c8 100644 --- a/include/core/SkCanvasVirtualEnforcer.h +++ b/include/core/SkCanvasVirtualEnforcer.h @@ -60,13 +60,8 @@ protected: const SkPoint dstClips[], const SkMatrix preViewMatrices[], const SkPaint* paint, SkCanvas::SrcRectConstraint constraint) override {} #else - // TODO (michaelludwig) - Make this = 0 once Flutter's canvas has been updated. - void onDrawEdgeAAQuad(const SkRect&, const SkPoint[4], - SkCanvas::QuadAAFlags, const SkColor4f&, SkBlendMode) override {} - // TODO (michaelludwig) - Remove once flutter is updated, but must be declared here so that - // the overload doesn't get hidden by subclasses. - void onDrawEdgeAAQuad(const SkRect&, const SkPoint[4], - SkCanvas::QuadAAFlags, SkColor, SkBlendMode) override {} + void onDrawEdgeAAQuad(const SkRect& rect, const SkPoint clip[4], + SkCanvas::QuadAAFlags aaFlags, const SkColor4f& color, SkBlendMode mode) override = 0; void onDrawEdgeAAImageSet(const SkCanvas::ImageSetEntry imageSet[], int count, const SkPoint dstClips[], const SkMatrix preViewMatrices[], const SkPaint* paint, SkCanvas::SrcRectConstraint constraint) override = 0; diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 37eb9580d3..ff9970e64a 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1984,9 +1984,6 @@ void SkCanvas::experimental_DrawEdgeAAQuad(const SkRect& rect, const SkPoint cli TRACE_EVENT0("skia", TRACE_FUNC); // Make sure the rect is sorted before passing it along this->onDrawEdgeAAQuad(rect.makeSorted(), clip, aaFlags, color, mode); - // Notify old virtual as well, although this should just be a no-op - // TODO (michaelludwig) - remove once flutter is updated - this->onDrawEdgeAAQuad(rect.makeSorted(), clip, aaFlags, color.toSkColor(), mode); } void SkCanvas::experimental_DrawEdgeAAImageSet(const ImageSetEntry imageSet[], int cnt,