AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
b9bd12d6f8
skia2/include/utils/SkNoDrawCanvas.h

81 lines
3.6 KiB
C
Raw Normal View History

SkNoDrawCanvas - a public non-drawing canvas base class TODO: - convert SkDeferredCanvas, SkLiteRecorder, etc. to the new base - remove unused SkNoSaveLayerCanvas BUG=chromium:668925 R=reed@google.com,mtklein@google.com Change-Id: Ie9af577477a6b9eaa5ef55523287ad1635dca116 Reviewed-on: https://skia-review.googlesource.com/5349 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-01 17:47:59 +00:00
/*
* Copyright 2016 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkNoDrawCanvas_DEFINED
#define SkNoDrawCanvas_DEFINED
rewrite includes to not need so much -Ifoo Current strategy: everything from the top Things to look at first are the manual changes: - added tools/rewrite_includes.py - removed -Idirectives from BUILD.gn - various compile.sh simplifications - tweak tools/embed_resources.py - update gn/find_headers.py to write paths from the top - update gn/gn_to_bp.py SkUserConfig.h layout so that #include "include/config/SkUserConfig.h" always gets the header we want. No-Presubmit: true Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Hal Canary <halcanary@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-04-23 17:05:21 +00:00
#include "include/core/SkCanvas.h"
#include "include/core/SkCanvasVirtualEnforcer.h"
SkNoDrawCanvas - a public non-drawing canvas base class TODO: - convert SkDeferredCanvas, SkLiteRecorder, etc. to the new base - remove unused SkNoSaveLayerCanvas BUG=chromium:668925 R=reed@google.com,mtklein@google.com Change-Id: Ie9af577477a6b9eaa5ef55523287ad1635dca116 Reviewed-on: https://skia-review.googlesource.com/5349 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-01 17:47:59 +00:00
Rebase non-drawing SkCanvas subclasses to SkNoDrawCanvas R=reed@google.com,mtklein@google.com Change-Id: I7df84587821db561e262a915afa23108a4a78834 Reviewed-on: https://skia-review.googlesource.com/5508 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-02 17:05:41 +00:00
struct SkIRect;
SkNoDrawCanvas - a public non-drawing canvas base class TODO: - convert SkDeferredCanvas, SkLiteRecorder, etc. to the new base - remove unused SkNoSaveLayerCanvas BUG=chromium:668925 R=reed@google.com,mtklein@google.com Change-Id: Ie9af577477a6b9eaa5ef55523287ad1635dca116 Reviewed-on: https://skia-review.googlesource.com/5349 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-01 17:47:59 +00:00
// SkNoDrawCanvas is a helper for SkCanvas subclasses which do not need to
// actually rasterize (e.g., analysis of the draw calls).
//
// It provides the following simplifications:
//
// * not backed by any device/pixels
// * conservative clipping (clipping calls only use rectangles)
//
Shim to enforce that canvas virtuals are overridden Change-Id: Iad70d449bbc43195baefd70d20c41996a8435e6e Reviewed-on: https://skia-review.googlesource.com/113320 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com>
2018-03-09 18:40:31 +00:00
class SK_API SkNoDrawCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
SkNoDrawCanvas - a public non-drawing canvas base class TODO: - convert SkDeferredCanvas, SkLiteRecorder, etc. to the new base - remove unused SkNoSaveLayerCanvas BUG=chromium:668925 R=reed@google.com,mtklein@google.com Change-Id: Ie9af577477a6b9eaa5ef55523287ad1635dca116 Reviewed-on: https://skia-review.googlesource.com/5349 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-01 17:47:59 +00:00
public:
SkNoDrawCanvas(int width, int height);
Rebase non-drawing SkCanvas subclasses to SkNoDrawCanvas R=reed@google.com,mtklein@google.com Change-Id: I7df84587821db561e262a915afa23108a4a78834 Reviewed-on: https://skia-review.googlesource.com/5508 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-02 17:05:41 +00:00
SkNoDrawCanvas(const SkIRect&);
Take sk_sp<SkDevice> instead of SkDevice* Change-Id: I0b296bf5b80adc19758a3dc99160be9d2ed05680 Reviewed-on: https://skia-review.googlesource.com/125160 Commit-Queue: Herb Derby <herb@google.com> Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Mike Reed <reed@google.com> Auto-Submit: Herb Derby <herb@google.com>
2018-05-01 21:06:20 +00:00
explicit SkNoDrawCanvas(sk_sp<SkBaseDevice> device);
Apply filterTextFlags so the fonts are the same. In order to apply filterTextFlags correctly, teach TrackLayerDevice how to process save and restore layers. At this point, I don't see any other traffic than the cache warming traffic. This code has a performance between 82% and 105% of just drawing the picture. BUG=skia:7515 Change-Id: I44736be46884f18b6d120d4b5ca582f34dbdff0f Reviewed-on: https://skia-review.googlesource.com/114641 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Herb Derby <herb@google.com>
2018-03-15 21:34:40 +00:00
Expose resetForNextPicture in SkNoDrawCanvas SkRecorder has some private Skia behavior with the way it handles an SkNoDrawCanvas that is not exposed. In particular, it's able to create an arbitrary SkIRect device clip at construction time. This is a performance optimization when reusing SkNoDrawCanvas across multiple recordings instead of reconstructing a new canvas every time. https://codereview.chromium.org/2768143002 is trying to implement another version of SkPictureBuilder/SkRecorder and so wants to be able to use similar SkNoDrawCanvas behavior. Change-Id: I0ac5f0eef8f0548cefd7354062311667cf448b07 Reviewed-on: https://skia-review.googlesource.com/11320 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-05-01 20:45:01 +00:00
// Optimization to reset state to be the same as after construction.
track SkNoPixelsDevice's origin Today we do a fairly decent job of tracking device bounds as an SkIRect, with a little more of that plumbed through here, but that gets foiled in SkNoPixelsDevice's constructor where we only look at bounds.width() and bounds.height(). I think the idea was to follow the usual constraint that a "base" layer has an origin at (0,0) and only temporary "save" layers on top might be offset, but for a device without any pixels it's pretty reasonable for the base layer to be offset too. This makes picture_cull_rect draw correctly in serialize-8888 mode. Bug: skia:9334 Change-Id: I845e74779bb21cbfd4051b0ef07381e684176eac Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236859 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2019-08-23 15:47:30 +00:00
void resetCanvas(int w, int h) { this->resetForNextPicture(SkIRect::MakeWH(w, h)); }
void resetCanvas(const SkIRect& rect) { this->resetForNextPicture(rect); }
Expose resetForNextPicture in SkNoDrawCanvas SkRecorder has some private Skia behavior with the way it handles an SkNoDrawCanvas that is not exposed. In particular, it's able to create an arbitrary SkIRect device clip at construction time. This is a performance optimization when reusing SkNoDrawCanvas across multiple recordings instead of reconstructing a new canvas every time. https://codereview.chromium.org/2768143002 is trying to implement another version of SkPictureBuilder/SkRecorder and so wants to be able to use similar SkNoDrawCanvas behavior. Change-Id: I0ac5f0eef8f0548cefd7354062311667cf448b07 Reviewed-on: https://skia-review.googlesource.com/11320 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-05-01 20:45:01 +00:00
SkNoDrawCanvas - a public non-drawing canvas base class TODO: - convert SkDeferredCanvas, SkLiteRecorder, etc. to the new base - remove unused SkNoSaveLayerCanvas BUG=chromium:668925 R=reed@google.com,mtklein@google.com Change-Id: Ie9af577477a6b9eaa5ef55523287ad1635dca116 Reviewed-on: https://skia-review.googlesource.com/5349 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-01 17:47:59 +00:00
protected:
SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override;
add saveBehind to canvas Bug: skia: Change-Id: I62e48b116b2d7efef585d4f465441f24ae4d2b29 Reviewed-on: https://skia-review.googlesource.com/c/177892 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-12-18 22:38:18 +00:00
bool onDoSaveBehind(const SkRect*) override;
SkNoDrawCanvas - a public non-drawing canvas base class TODO: - convert SkDeferredCanvas, SkLiteRecorder, etc. to the new base - remove unused SkNoSaveLayerCanvas BUG=chromium:668925 R=reed@google.com,mtklein@google.com Change-Id: Ie9af577477a6b9eaa5ef55523287ad1635dca116 Reviewed-on: https://skia-review.googlesource.com/5349 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-01 17:47:59 +00:00
Add no-op draw overrides to SkNoDrawCanvas SkNoDrawCanvas is not backed by pixels, but for draw ops not intercepted by clients we abort rasterization failry late (SkNullBlitter). BUG=chromium:668925 R=reed@google.com Change-Id: I4cd80dbbc262936d33410275051ea0b9c04fbc6c Reviewed-on: https://skia-review.googlesource.com/5543 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Mike Reed <reed@google.com>
2016-12-04 16:44:52 +00:00
// No-op overrides for aborting rasterization earlier than SkNullBlitter.
Shim to enforce that canvas virtuals are overridden Change-Id: Iad70d449bbc43195baefd70d20c41996a8435e6e Reviewed-on: https://skia-review.googlesource.com/113320 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com>
2018-03-09 18:40:31 +00:00
void onDrawAnnotation(const SkRect&, const char[], SkData*) override {}
Add no-op draw overrides to SkNoDrawCanvas SkNoDrawCanvas is not backed by pixels, but for draw ops not intercepted by clients we abort rasterization failry late (SkNullBlitter). BUG=chromium:668925 R=reed@google.com Change-Id: I4cd80dbbc262936d33410275051ea0b9c04fbc6c Reviewed-on: https://skia-review.googlesource.com/5543 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Mike Reed <reed@google.com>
2016-12-04 16:44:52 +00:00
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override {}
void onDrawDrawable(SkDrawable*, const SkMatrix*) override {}
void onDrawTextBlob(const SkTextBlob*, SkScalar, SkScalar, const SkPaint&) override {}
void onDrawPatch(const SkPoint[12], const SkColor[4], const SkPoint[4], SkBlendMode,
const SkPaint&) override {}
void onDrawPaint(const SkPaint&) override {}
Add secret draw-behind method This is a variant of drawPaint but is automatically clipped to the bounds of the most recent saveBehind buffer (axis-aligned bounds). No public exposure. Impl is pretty simple (its a variant of drawPaint) - find the most recent saveBehind device bounds - if there is none, draw nothing, else - temporarily intersect the device's clip with that bounds - drawPaint - restore the clip See https://buganizer.corp.google.com/issues/129117085 Change-Id: I7c532e63a80b118fb2416c572b8e0d2abf8cf59a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209166 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-04-19 19:00:47 +00:00
void onDrawBehind(const SkPaint&) override {}
Add no-op draw overrides to SkNoDrawCanvas SkNoDrawCanvas is not backed by pixels, but for draw ops not intercepted by clients we abort rasterization failry late (SkNullBlitter). BUG=chromium:668925 R=reed@google.com Change-Id: I4cd80dbbc262936d33410275051ea0b9c04fbc6c Reviewed-on: https://skia-review.googlesource.com/5543 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Mike Reed <reed@google.com>
2016-12-04 16:44:52 +00:00
void onDrawPoints(PointMode, size_t, const SkPoint[], const SkPaint&) override {}
void onDrawRect(const SkRect&, const SkPaint&) override {}
void onDrawRegion(const SkRegion&, const SkPaint&) override {}
void onDrawOval(const SkRect&, const SkPaint&) override {}
void onDrawArc(const SkRect&, SkScalar, SkScalar, bool, const SkPaint&) override {}
void onDrawRRect(const SkRRect&, const SkPaint&) override {}
void onDrawPath(const SkPath&, const SkPaint&) override {}
remove dead code from old drawimage virtuals Bug: skia:7650 Change-Id: Ie6bce2130519655645b7c5602d364cd0e1d6fdf3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356358 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2021-01-20 20:22:51 +00:00
Reland "Add new virts, hide old ones" This reverts commit 8f924ac0ce63806886b7297e8be554984a6e7ce5. Reason for revert: suppressions landed for fuchsia images to rebaseline Original change's description: > Revert "Add new virts, hide old ones" > > This reverts commit c56e2e5aa65dd129e5927224d2f6c1f82edff74e. > > Reason for revert: suspected of breaking chrome roll > > Original change's description: > > Add new virts, hide old ones > > > > Add virtuals for the draw methods that now take sampling/filtermode. > > > > drawImage > > drawImageRect > > drawImageLattice > > drawAtlas > > > > Add a flag that can remove the older virtuals, once each client has > > stopped overriding them. In that situation, the older public methods > > will simplify extract the sampling from the paint, and call the new > > public methods. > > > > Bug: skia:11105, skia:7650 > > Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022 > > Commit-Queue: Mike Reed <reed@google.com> > > Reviewed-by: Florin Malita <fmalita@chromium.org> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com > > Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11105 > Bug: skia:7650 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194 > Reviewed-by: Derek Sollenberger <djsollen@google.com> > Commit-Queue: Derek Sollenberger <djsollen@google.com> TBR=djsollen@google.com,bsalomon@google.com,fmalita@chromium.org,reed@google.com # Not skipping CQ checks because this is a reland. Bug: skia:11105 Bug: skia:7650 Change-Id: Ia2b4537a2d330460b7554278d2c05075cf27162a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348876 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2020-12-30 14:22:42 +00:00
void onDrawImage2(const SkImage*, SkScalar, SkScalar, const SkSamplingOptions&,
const SkPaint*) override {}
void onDrawImageRect2(const SkImage*, const SkRect&, const SkRect&, const SkSamplingOptions&,
const SkPaint*, SrcRectConstraint) override {}
void onDrawImageLattice2(const SkImage*, const Lattice&, const SkRect&, SkFilterMode,
const SkPaint*) override {}
void onDrawAtlas2(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int,
SkBlendMode, const SkSamplingOptions&, const SkRect*, const SkPaint*) override {}
void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&) override {}
Fill in some missing virtuals from canvas subclasses Bug: skia: Change-Id: If7306fa6c5a1619952e1159e6ebca8f04b4d9c8e Reviewed-on: https://skia-review.googlesource.com/113262 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2018-03-08 19:52:20 +00:00
void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&) override {}
Shim to enforce that canvas virtuals are overridden Change-Id: Iad70d449bbc43195baefd70d20c41996a8435e6e Reviewed-on: https://skia-review.googlesource.com/113320 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com>
2018-03-09 18:40:31 +00:00
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override {}
Add no-op draw overrides to SkNoDrawCanvas SkNoDrawCanvas is not backed by pixels, but for draw ops not intercepted by clients we abort rasterization failry late (SkNullBlitter). BUG=chromium:668925 R=reed@google.com Change-Id: I4cd80dbbc262936d33410275051ea0b9c04fbc6c Reviewed-on: https://skia-review.googlesource.com/5543 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Mike Reed <reed@google.com>
2016-12-04 16:44:52 +00:00
Add Color4f variant for DrawEdgeAAQuad Bug: chromium:795132,chromium:985500 Change-Id: Idbb4d45b29d2c0d0fd54b05b807086ecf0b8cf26 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237492 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
2019-08-27 19:25:49 +00:00
void onDrawEdgeAAQuad(const SkRect&, const SkPoint[4], QuadAAFlags, const SkColor4f&,
Reland "Reland "Update SkCanvas' experimental SkiaRenderer API"" This reverts commit 138a06d1b1cd035daf6b6a970c75126e94777822. Reason for revert: add explicit constructors to ImageSetEntry to account for the new arguments, matching SkiaRenderer's current initializer list. Also hardens SkPictureDrawback's deserialization code for drawEdgeAAImageSet and drawEdgeAAQuad from a fuzz that was found during the CL's brief lifespan. Original change's description: > Revert "Reland "Update SkCanvas' experimental SkiaRenderer API"" > > This reverts commit bd9d88a6e4d9730f3aa67227e5a1618180513a87. > > Reason for revert: Breaks SkiaRenderer on Android. Rendering is all corrupted, bisected to this change. > > Original change's description: > > Reland "Update SkCanvas' experimental SkiaRenderer API" > > > > This reverts commit 90791c202dd2d943565237bf511d929e8bd19951. > > > > Reason for revert: Jumped the gun, just need to update blacklist > > > > Original change's description: > > > Revert "Update SkCanvas' experimental SkiaRenderer API" > > > > > > This reverts commit 4bf964602ab8758f6e580aaaa69add4fb260c1a6. > > > > > > Reason for revert: vulkan dm crashes > > > > > > Original change's description: > > > > Update SkCanvas' experimental SkiaRenderer API > > > > > > > > This lifts the temporary functions in SkGpuDevice into SkCanvas and > > > > deprecates the older experimental_DrawImageSetV1 and > > > > experimental_DrawEdgeAARect. The new functions can handle paints and > > > > transform batching. Internally, SkCanvas routes the old functions to the > > > > new entry points and all device-level code is updated to handle the new > > > > API features. > > > > > > > > While touching all of the canvas/device/recording areas, the > > > > experimental functions are grouped in an "EdgeAA" cluster instead of being > > > > separated into the image category and the rectangle category. > > > > > > > > Bug: skia:8739 > > > > Change-Id: I67c2a724873040ad5dc3307ab5b2823ba1eac54b > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/190221 > > > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > > > > > Change-Id: I87a5a258c5a1bd15e16389cdf91743772d6fa98a > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: skia:8739 > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201226 > > > Reviewed-by: Michael Ludwig <michaelludwig@google.com> > > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > > > Change-Id: I75e9b6cbf079a7739b69a7e208730a930621abf9 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: skia:8739 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201229 > > Reviewed-by: Michael Ludwig <michaelludwig@google.com> > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > Auto-Submit: Michael Ludwig <michaelludwig@google.com> > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > Change-Id: Ib87ef9b8b8598c16a8a6915920adf0b5dffc644b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:8739 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201391 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> Bug: skia:8739, oss-fuzz:13794 Change-Id: Ibd7df4a398928c3170d16300bf3ade496125372c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201650 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-03-19 13:16:38 +00:00
SkBlendMode) override {}
Pass sampling to drawImageSet Bug: skia:7650 Change-Id: I93d41ca6e5beb85e9924ea2f3e0a82c18ff51369 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/349617 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Mike Reed <reed@google.com>
2021-01-05 17:03:47 +00:00
void onDrawEdgeAAImageSet2(const ImageSetEntry[], int, const SkPoint[], const SkMatrix[],
const SkSamplingOptions&, const SkPaint*,
SrcRectConstraint) override {}
Reland "Reland "Update SkCanvas' experimental SkiaRenderer API"" This reverts commit 138a06d1b1cd035daf6b6a970c75126e94777822. Reason for revert: add explicit constructors to ImageSetEntry to account for the new arguments, matching SkiaRenderer's current initializer list. Also hardens SkPictureDrawback's deserialization code for drawEdgeAAImageSet and drawEdgeAAQuad from a fuzz that was found during the CL's brief lifespan. Original change's description: > Revert "Reland "Update SkCanvas' experimental SkiaRenderer API"" > > This reverts commit bd9d88a6e4d9730f3aa67227e5a1618180513a87. > > Reason for revert: Breaks SkiaRenderer on Android. Rendering is all corrupted, bisected to this change. > > Original change's description: > > Reland "Update SkCanvas' experimental SkiaRenderer API" > > > > This reverts commit 90791c202dd2d943565237bf511d929e8bd19951. > > > > Reason for revert: Jumped the gun, just need to update blacklist > > > > Original change's description: > > > Revert "Update SkCanvas' experimental SkiaRenderer API" > > > > > > This reverts commit 4bf964602ab8758f6e580aaaa69add4fb260c1a6. > > > > > > Reason for revert: vulkan dm crashes > > > > > > Original change's description: > > > > Update SkCanvas' experimental SkiaRenderer API > > > > > > > > This lifts the temporary functions in SkGpuDevice into SkCanvas and > > > > deprecates the older experimental_DrawImageSetV1 and > > > > experimental_DrawEdgeAARect. The new functions can handle paints and > > > > transform batching. Internally, SkCanvas routes the old functions to the > > > > new entry points and all device-level code is updated to handle the new > > > > API features. > > > > > > > > While touching all of the canvas/device/recording areas, the > > > > experimental functions are grouped in an "EdgeAA" cluster instead of being > > > > separated into the image category and the rectangle category. > > > > > > > > Bug: skia:8739 > > > > Change-Id: I67c2a724873040ad5dc3307ab5b2823ba1eac54b > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/190221 > > > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > > > > > Change-Id: I87a5a258c5a1bd15e16389cdf91743772d6fa98a > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: skia:8739 > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201226 > > > Reviewed-by: Michael Ludwig <michaelludwig@google.com> > > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > > > Change-Id: I75e9b6cbf079a7739b69a7e208730a930621abf9 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: skia:8739 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201229 > > Reviewed-by: Michael Ludwig <michaelludwig@google.com> > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > Auto-Submit: Michael Ludwig <michaelludwig@google.com> > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > Change-Id: Ib87ef9b8b8598c16a8a6915920adf0b5dffc644b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:8739 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201391 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> Bug: skia:8739, oss-fuzz:13794 Change-Id: Ibd7df4a398928c3170d16300bf3ade496125372c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201650 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-03-19 13:16:38 +00:00
SkNoDrawCanvas - a public non-drawing canvas base class TODO: - convert SkDeferredCanvas, SkLiteRecorder, etc. to the new base - remove unused SkNoSaveLayerCanvas BUG=chromium:668925 R=reed@google.com,mtklein@google.com Change-Id: Ie9af577477a6b9eaa5ef55523287ad1635dca116 Reviewed-on: https://skia-review.googlesource.com/5349 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-01 17:47:59 +00:00
private:
Replace 'typedef xxxxx INHERITED' with 'using INHERITED = xxxx;'. Mechanically updated via Xcode "Replace Regular Expression": typedef (.*) INHERITED; --> using INHERITED = $1; The ClangTidy approach generated an even larger CL which would have required a significant amount of hand-tweaking to be usable. Change-Id: I671dc9d9efdf6d60151325c8d4d13fad7e10a15b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/314999 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-03 02:42:33 +00:00
using INHERITED = SkCanvasVirtualEnforcer<SkCanvas>;
SkNoDrawCanvas - a public non-drawing canvas base class TODO: - convert SkDeferredCanvas, SkLiteRecorder, etc. to the new base - remove unused SkNoSaveLayerCanvas BUG=chromium:668925 R=reed@google.com,mtklein@google.com Change-Id: Ie9af577477a6b9eaa5ef55523287ad1635dca116 Reviewed-on: https://skia-review.googlesource.com/5349 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2016-12-01 17:47:59 +00:00
};
Retire SkNoSaveLayerCanvas No clients, superseded by SkNoDrawCanvas. R=reed@google.com Change-Id: I93352c6cfb24ec133ed8433c3b31a5fa5ab1ace8 Reviewed-on: https://skia-review.googlesource.com/5460 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com>
2016-12-01 20:46:26 +00:00
#endif // SkNoDrawCanvas_DEFINED
Reference in New Issue Copy Permalink