2012-06-29 14:21:22 +00:00
|
|
|
/*
|
|
|
|
* Copyright 2012 Google Inc.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
* found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef SKDEBUGCANVAS_H_
|
|
|
|
#define SKDEBUGCANVAS_H_
|
|
|
|
|
2019-04-23 17:05:21 +00:00
|
|
|
#include "include/core/SkCanvas.h"
|
|
|
|
#include "include/core/SkCanvasVirtualEnforcer.h"
|
|
|
|
#include "include/core/SkPath.h"
|
|
|
|
#include "include/core/SkString.h"
|
|
|
|
#include "include/core/SkVertices.h"
|
|
|
|
#include "include/pathops/SkPathOps.h"
|
|
|
|
#include "include/private/SkTArray.h"
|
|
|
|
#include "tools/UrlDataManager.h"
|
2019-12-12 16:05:10 +00:00
|
|
|
#include "tools/debugger/DebugLayerManager.h"
|
2019-04-23 17:05:21 +00:00
|
|
|
#include "tools/debugger/DrawCommand.h"
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2020-09-16 14:35:22 +00:00
|
|
|
#include <map>
|
|
|
|
#include <vector>
|
|
|
|
|
2016-03-10 21:29:36 +00:00
|
|
|
class GrAuditTrail;
|
2015-03-26 14:24:48 +00:00
|
|
|
class SkNWayCanvas;
|
2018-04-06 18:51:42 +00:00
|
|
|
class SkPicture;
|
2019-12-12 16:05:10 +00:00
|
|
|
class DebugLayerManager;
|
2013-10-17 17:56:10 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
class DebugCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 16:59:00 +00:00
|
|
|
DebugCanvas(int width, int height);
|
2016-07-21 17:25:54 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
DebugCanvas(SkIRect bounds);
|
2019-03-13 17:31:13 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
~DebugCanvas() override;
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2019-12-12 16:05:10 +00:00
|
|
|
/**
|
|
|
|
* Provide a DebugLayerManager for mskp files containing layer information
|
|
|
|
* when set this DebugCanvas will attempt to parse layer info from annotations.
|
|
|
|
* it will store layer pictures to the layer manager, and interpret some drawImageRects
|
|
|
|
* as layer draws, deferring to the layer manager for images.
|
|
|
|
* Provide a frame number that will be passed to all layer manager functions to identify this
|
|
|
|
* DebugCanvas.
|
|
|
|
*
|
|
|
|
* Used only in wasm debugger animations.
|
|
|
|
*/
|
|
|
|
void setLayerManagerAndFrame(DebugLayerManager* lm, int frame) {
|
|
|
|
fLayerManager = lm;
|
|
|
|
fFrame = frame;
|
|
|
|
}
|
|
|
|
|
2013-02-06 20:13:54 +00:00
|
|
|
/**
|
|
|
|
* Enable or disable overdraw visualization
|
|
|
|
*/
|
2015-03-26 14:24:48 +00:00
|
|
|
void setOverdrawViz(bool overdrawViz);
|
2016-07-21 17:25:54 +00:00
|
|
|
|
2014-03-25 23:31:33 +00:00
|
|
|
bool getOverdrawViz() const { return fOverdrawViz; }
|
|
|
|
|
2016-02-12 20:06:53 +00:00
|
|
|
/**
|
|
|
|
* Set the color of the clip visualization. An alpha of zero renders the clip invisible.
|
|
|
|
*/
|
|
|
|
void setClipVizColor(SkColor clipVizColor) { this->fClipVizColor = clipVizColor; }
|
2016-07-21 17:25:54 +00:00
|
|
|
|
2020-08-20 16:33:46 +00:00
|
|
|
void setAndroidClipViz(bool enable) { this->fShowAndroidClip = enable; }
|
|
|
|
|
|
|
|
void setOriginVisible(bool enable) { this->fShowOrigin = enable; }
|
2020-01-10 19:38:00 +00:00
|
|
|
|
2016-12-20 21:48:59 +00:00
|
|
|
void setDrawGpuOpBounds(bool drawGpuOpBounds) { fDrawGpuOpBounds = drawGpuOpBounds; }
|
2016-02-29 19:15:06 +00:00
|
|
|
|
2016-12-20 21:48:59 +00:00
|
|
|
bool getDrawGpuOpBounds() const { return fDrawGpuOpBounds; }
|
2016-02-29 20:46:04 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
/**
|
|
|
|
Executes all draw calls to the canvas.
|
|
|
|
@param canvas The canvas being drawn to
|
|
|
|
*/
|
2019-03-20 16:59:00 +00:00
|
|
|
void draw(SkCanvas* canvas);
|
2012-06-29 14:21:22 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
Executes the draw calls up to the specified index.
|
2019-12-12 16:05:10 +00:00
|
|
|
Does not clear the canvas to transparent black first,
|
|
|
|
if needed, caller should do that first.
|
2012-06-29 14:21:22 +00:00
|
|
|
@param canvas The canvas being drawn to
|
|
|
|
@param index The index of the final command being executed
|
2016-12-20 21:48:59 +00:00
|
|
|
@param m an optional Mth gpu op to highlight, or -1
|
2012-06-29 14:21:22 +00:00
|
|
|
*/
|
2019-03-20 16:59:00 +00:00
|
|
|
void drawTo(SkCanvas* canvas, int index, int m = -1);
|
2012-07-31 19:55:32 +00:00
|
|
|
|
2012-08-03 17:32:05 +00:00
|
|
|
/**
|
|
|
|
Returns the most recently calculated transformation matrix
|
|
|
|
*/
|
2020-12-03 16:21:31 +00:00
|
|
|
const SkM44& getCurrentMatrix() { return fMatrix; }
|
2012-08-03 17:32:05 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
Returns the most recently calculated clip
|
|
|
|
*/
|
2019-03-20 16:59:00 +00:00
|
|
|
const SkIRect& getCurrentClip() { return fClip; }
|
2012-08-03 17:32:05 +00:00
|
|
|
|
2013-04-01 18:18:49 +00:00
|
|
|
/**
|
|
|
|
Removes the command at the specified index
|
|
|
|
@param index The index of the command to delete
|
|
|
|
*/
|
|
|
|
void deleteDrawCommandAt(int index);
|
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
/**
|
|
|
|
Returns the draw command at the given index.
|
|
|
|
@param index The index of the command
|
|
|
|
*/
|
2020-09-16 14:35:22 +00:00
|
|
|
DrawCommand* getDrawCommandAt(int index) const;
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2012-07-03 20:28:14 +00:00
|
|
|
/**
|
|
|
|
Returns length of draw command vector.
|
|
|
|
*/
|
2019-03-20 16:59:00 +00:00
|
|
|
int getSize() const { return fCommandVector.count(); }
|
2012-07-03 20:28:14 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
/**
|
|
|
|
Toggles the visibility / execution of the draw command at index i with
|
|
|
|
the value of toggle.
|
|
|
|
*/
|
|
|
|
void toggleCommand(int index, bool toggle);
|
|
|
|
|
2016-02-10 20:57:30 +00:00
|
|
|
/**
|
2019-12-13 18:51:14 +00:00
|
|
|
Returns a JSON object representing all commands in the picture.
|
|
|
|
The encoder may use the UrlDataManager to store binary data such
|
2016-02-12 20:06:53 +00:00
|
|
|
as images, referring to them via URLs embedded in the JSON.
|
2016-02-10 20:57:30 +00:00
|
|
|
*/
|
2019-12-13 18:51:14 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager, SkCanvas*);
|
2016-02-10 20:57:30 +00:00
|
|
|
|
2019-12-13 18:51:14 +00:00
|
|
|
void toJSONOpsTask(SkJSONWriter& writer, SkCanvas*);
|
2016-03-10 21:29:36 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void detachCommands(SkTDArray<DrawCommand*>* dst) { fCommandVector.swap(*dst); }
|
2017-09-06 17:07:21 +00:00
|
|
|
|
2020-09-16 14:35:22 +00:00
|
|
|
/**
|
|
|
|
Returns a map from image IDs to command indices where they are used.
|
|
|
|
*/
|
|
|
|
std::map<int, std::vector<int>> getImageIdToCommandMap(UrlDataManager& udm) const;
|
|
|
|
|
2014-02-21 12:20:45 +00:00
|
|
|
protected:
|
2019-03-20 16:59:00 +00:00
|
|
|
void willSave() override;
|
|
|
|
SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;
|
|
|
|
bool onDoSaveBehind(const SkRect*) override;
|
|
|
|
void willRestore() override;
|
2014-03-12 20:21:48 +00:00
|
|
|
|
2020-04-07 01:32:43 +00:00
|
|
|
void didConcat44(const SkM44&) override;
|
2020-11-25 18:37:30 +00:00
|
|
|
void didSetM44(const SkM44&) override;
|
2020-01-10 22:21:40 +00:00
|
|
|
void didScale(SkScalar, SkScalar) override;
|
|
|
|
void didTranslate(SkScalar, SkScalar) override;
|
2016-07-21 17:25:54 +00:00
|
|
|
|
2016-06-29 01:54:19 +00:00
|
|
|
void onDrawAnnotation(const SkRect&, const char[], SkData*) override;
|
2015-03-26 01:17:31 +00:00
|
|
|
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
|
2019-03-20 16:59:00 +00:00
|
|
|
void onDrawTextBlob(const SkTextBlob* blob,
|
|
|
|
SkScalar x,
|
|
|
|
SkScalar y,
|
|
|
|
const SkPaint& paint) override;
|
|
|
|
|
|
|
|
void onDrawPatch(const SkPoint cubics[12],
|
|
|
|
const SkColor colors[4],
|
|
|
|
const SkPoint texCoords[4],
|
|
|
|
SkBlendMode,
|
|
|
|
const SkPaint& paint) override;
|
2015-03-26 01:17:31 +00:00
|
|
|
void onDrawPaint(const SkPaint&) override;
|
2019-04-19 19:00:47 +00:00
|
|
|
void onDrawBehind(const SkPaint&) override;
|
2015-02-13 19:13:00 +00:00
|
|
|
|
2015-03-26 01:17:31 +00:00
|
|
|
void onDrawRect(const SkRect&, const SkPaint&) override;
|
|
|
|
void onDrawOval(const SkRect&, const SkPaint&) override;
|
2016-08-19 18:25:19 +00:00
|
|
|
void onDrawArc(const SkRect&, SkScalar, SkScalar, bool, const SkPaint&) override;
|
2015-03-26 01:17:31 +00:00
|
|
|
void onDrawRRect(const SkRRect&, const SkPaint&) override;
|
|
|
|
void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
|
2020-03-02 22:08:01 +00:00
|
|
|
void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&) override;
|
2015-03-26 01:17:31 +00:00
|
|
|
void onDrawPath(const SkPath&, const SkPaint&) override;
|
2018-03-12 14:57:28 +00:00
|
|
|
void onDrawRegion(const SkRegion&, const SkPaint&) override;
|
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
|
|
|
#ifdef SK_SUPPORT_LEGACY_ONDRAWIMAGERECT
|
2015-03-26 01:17:31 +00:00
|
|
|
void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
|
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 onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
|
|
|
|
const SkPaint*, SrcRectConstraint) override;
|
|
|
|
void onDrawImageLattice(const SkImage*, const Lattice& lattice, const SkRect& dst,
|
|
|
|
const SkPaint*) override;
|
|
|
|
void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[],
|
|
|
|
int, SkBlendMode, const SkRect*, const SkPaint*) override;
|
2021-01-05 17:03:47 +00:00
|
|
|
void onDrawEdgeAAImageSet(const ImageSetEntry[],
|
|
|
|
int count,
|
|
|
|
const SkPoint[],
|
|
|
|
const SkMatrix[],
|
|
|
|
const SkPaint*,
|
|
|
|
SrcRectConstraint) override;
|
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
|
|
|
#endif
|
|
|
|
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;
|
|
|
|
|
2016-12-09 14:00:50 +00:00
|
|
|
void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override;
|
|
|
|
void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override;
|
|
|
|
void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override;
|
2020-03-10 18:02:56 +00:00
|
|
|
void onClipShader(sk_sp<SkShader>, SkClipOp) override;
|
2016-12-09 14:00:50 +00:00
|
|
|
void onClipRegion(const SkRegion& region, SkClipOp) override;
|
2018-04-12 16:45:58 +00:00
|
|
|
void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&) override;
|
2015-03-26 01:17:31 +00:00
|
|
|
|
2018-05-29 18:55:50 +00:00
|
|
|
void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
|
2015-03-26 01:17:31 +00:00
|
|
|
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
|
2014-06-04 12:40:44 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void onDrawEdgeAAQuad(const SkRect&,
|
|
|
|
const SkPoint[4],
|
|
|
|
QuadAAFlags,
|
2019-08-27 19:25:49 +00:00
|
|
|
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;
|
2021-01-05 17:03:47 +00:00
|
|
|
void onDrawEdgeAAImageSet2(const ImageSetEntry[],
|
|
|
|
int count,
|
|
|
|
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
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
SkTDArray<DrawCommand*> fCommandVector;
|
2020-12-03 16:21:31 +00:00
|
|
|
SkM44 fMatrix;
|
2019-03-20 16:59:00 +00:00
|
|
|
SkIRect fClip;
|
2013-10-17 17:56:10 +00:00
|
|
|
|
2020-01-10 19:38:00 +00:00
|
|
|
bool fOverdrawViz = false;
|
2016-02-12 20:06:53 +00:00
|
|
|
SkColor fClipVizColor;
|
2020-01-10 19:38:00 +00:00
|
|
|
bool fDrawGpuOpBounds = false;
|
|
|
|
bool fShowAndroidClip = false;
|
2020-08-20 16:33:46 +00:00
|
|
|
bool fShowOrigin = false;
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2019-12-12 16:05:10 +00:00
|
|
|
// When not negative, indicates the render node id of the layer represented by the next
|
|
|
|
// drawPicture call.
|
|
|
|
int fnextDrawPictureLayerId = -1;
|
|
|
|
int fnextDrawImageRectLayerId = -1;
|
|
|
|
SkIRect fnextDrawPictureDirtyRect;
|
|
|
|
// may be null, in which case layer annotations are ignored.
|
|
|
|
DebugLayerManager* fLayerManager = nullptr;
|
|
|
|
// May be set when DebugCanvas is used in playing back an animation.
|
|
|
|
// Only used for passing to fLayerManager to identify itself.
|
|
|
|
int fFrame = -1;
|
2020-01-10 19:38:00 +00:00
|
|
|
SkRect fAndroidClip = SkRect::MakeEmpty();
|
2019-12-12 16:05:10 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
/**
|
2017-09-06 17:07:21 +00:00
|
|
|
Adds the command to the class' vector of commands.
|
2012-06-29 14:21:22 +00:00
|
|
|
@param command The draw command for execution
|
|
|
|
*/
|
2019-03-20 16:59:00 +00:00
|
|
|
void addDrawCommand(DrawCommand* command);
|
2012-08-01 15:57:52 +00:00
|
|
|
|
2016-03-10 21:29:36 +00:00
|
|
|
GrAuditTrail* getAuditTrail(SkCanvas*);
|
|
|
|
|
2019-12-13 18:51:14 +00:00
|
|
|
void drawAndCollectOps(SkCanvas*);
|
2016-03-10 21:29:36 +00:00
|
|
|
void cleanupAuditTrail(SkCanvas*);
|
2015-03-26 14:24:48 +00:00
|
|
|
|
2020-09-03 02:42:33 +00:00
|
|
|
using INHERITED = SkCanvasVirtualEnforcer<SkCanvas>;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#endif
|