AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix flutter roll"

Browse Source 
This reverts commit 7be971fa3a.

Reason for revert: Flutter has been updated to new API, these patches
should not be necessary.

Original change's description:
> Fix flutter roll
>
> Flutter extends from the SkCanvasVirtualEnforcer, so the prior change
> to onDrawEdgeAAQuad to accept an SkColor4f instead of SkColor broke
> their build, the flutter roller, and--transitively--the G3 roller.
>
> This keeps the old onDrawEdgeAAQuad around as a no-op so their
> canvas_spy class can extend from it.
>
> TBR=bsalomon@google.com, stani@google.com
>
> Bug: skia:
> Change-Id: I3798ec60a21e90c3d3f5d59f19f7dbe62e37cbec
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237590
> Reviewed-by: Michael Ludwig <michaelludwig@google.com>
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>

TBR=bsalomon@google.com,stani@google.com,michaelludwig@google.com

Change-Id: I2946043dbddfdfc8c853e68853a8a349db0b5ab1
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237901
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
Michael Ludwig 2019-08-28 18:47:36 +00:00 committed by Skia Commit-Bot
parent 0e68f44212
commit 6c580f3cc1
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/core/SkCanvas.h
View File

@ -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);

9
include/core/SkCanvasVirtualEnforcer.h
View File

@ -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;

3
src/core/SkCanvas.cpp
View File

@ -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,