390f0cc1f8
This reverts commit138a06d1b1
. 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 commitbd9d88a6e4
. > > 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 commit90791c202d
. > > > > Reason for revert: Jumped the gun, just need to update blacklist > > > > Original change's description: > > > Revert "Update SkCanvas' experimental SkiaRenderer API" > > > > > > This reverts commit4bf964602a
. > > > > > > 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>
198 lines
6.9 KiB
C++
198 lines
6.9 KiB
C++
/*
|
|
* 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_
|
|
|
|
#include "SkCanvas.h"
|
|
#include "SkCanvasVirtualEnforcer.h"
|
|
#include "SkDrawCommand.h"
|
|
#include "SkPath.h"
|
|
#include "SkPathOps.h"
|
|
#include "SkString.h"
|
|
#include "SkTArray.h"
|
|
#include "SkVertices.h"
|
|
#include "UrlDataManager.h"
|
|
|
|
class GrAuditTrail;
|
|
class SkNWayCanvas;
|
|
class SkPicture;
|
|
|
|
class SkDebugCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
|
|
public:
|
|
SkDebugCanvas(int width, int height);
|
|
|
|
SkDebugCanvas(SkIRect bounds);
|
|
|
|
~SkDebugCanvas() override;
|
|
|
|
/**
|
|
* Enable or disable overdraw visualization
|
|
*/
|
|
void setOverdrawViz(bool overdrawViz);
|
|
|
|
bool getOverdrawViz() const { return fOverdrawViz; }
|
|
|
|
/**
|
|
* Set the color of the clip visualization. An alpha of zero renders the clip invisible.
|
|
*/
|
|
void setClipVizColor(SkColor clipVizColor) { this->fClipVizColor = clipVizColor; }
|
|
|
|
void setDrawGpuOpBounds(bool drawGpuOpBounds) { fDrawGpuOpBounds = drawGpuOpBounds; }
|
|
|
|
bool getDrawGpuOpBounds() const { return fDrawGpuOpBounds; }
|
|
|
|
/**
|
|
Executes all draw calls to the canvas.
|
|
@param canvas The canvas being drawn to
|
|
*/
|
|
void draw(SkCanvas *canvas);
|
|
|
|
/**
|
|
Executes the draw calls up to the specified index.
|
|
@param canvas The canvas being drawn to
|
|
@param index The index of the final command being executed
|
|
@param m an optional Mth gpu op to highlight, or -1
|
|
*/
|
|
void drawTo(SkCanvas *canvas, int index, int m = -1);
|
|
|
|
/**
|
|
Returns the most recently calculated transformation matrix
|
|
*/
|
|
const SkMatrix &getCurrentMatrix() {
|
|
return fMatrix;
|
|
}
|
|
|
|
/**
|
|
Returns the most recently calculated clip
|
|
*/
|
|
const SkIRect &getCurrentClip() {
|
|
return fClip;
|
|
}
|
|
|
|
/**
|
|
Removes the command at the specified index
|
|
@param index The index of the command to delete
|
|
*/
|
|
void deleteDrawCommandAt(int index);
|
|
|
|
/**
|
|
Returns the draw command at the given index.
|
|
@param index The index of the command
|
|
*/
|
|
SkDrawCommand *getDrawCommandAt(int index);
|
|
|
|
/**
|
|
Returns length of draw command vector.
|
|
*/
|
|
int getSize() const {
|
|
return fCommandVector.count();
|
|
}
|
|
|
|
/**
|
|
Toggles the visibility / execution of the draw command at index i with
|
|
the value of toggle.
|
|
*/
|
|
void toggleCommand(int index, bool toggle);
|
|
|
|
/**
|
|
Returns a JSON object representing up to the Nth draw, where N is less than
|
|
SkDebugCanvas::getSize(). The encoder may use the UrlDataManager to store binary data such
|
|
as images, referring to them via URLs embedded in the JSON.
|
|
*/
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager &urlDataManager, int n, SkCanvas *);
|
|
|
|
void toJSONOpList(SkJSONWriter& writer, int n, SkCanvas*);
|
|
|
|
void detachCommands(SkTDArray<SkDrawCommand*>* dst) {
|
|
fCommandVector.swap(*dst);
|
|
}
|
|
|
|
protected:
|
|
void willSave() override;
|
|
SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec &) override;
|
|
bool onDoSaveBehind(const SkRect*) override;
|
|
void willRestore() override;
|
|
|
|
void didConcat(const SkMatrix &) override;
|
|
|
|
void didSetMatrix(const SkMatrix &) override;
|
|
|
|
void onDrawAnnotation(const SkRect&, const char[], SkData*) override;
|
|
void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
|
|
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;
|
|
void onDrawPaint(const SkPaint&) override;
|
|
|
|
void onDrawRect(const SkRect&, 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 onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
|
|
void onDrawVerticesObject(const SkVertices*, const SkVertices::Bone bones[], int boneCount,
|
|
SkBlendMode, const SkPaint&) override;
|
|
void onDrawPath(const SkPath&, const SkPaint&) override;
|
|
void onDrawRegion(const SkRegion&, const SkPaint&) override;
|
|
void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
|
|
void onDrawBitmapLattice(const SkBitmap&, const Lattice&, const SkRect&,
|
|
const SkPaint*) override;
|
|
void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
|
|
SrcRectConstraint) override;
|
|
void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
|
|
void onDrawImageLattice(const SkImage* image, const Lattice& lattice,
|
|
const SkRect& dst, const SkPaint* paint) override;
|
|
void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
|
|
const SkPaint*, SrcRectConstraint) override;
|
|
void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
|
|
const SkPaint*) override;
|
|
void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,
|
|
const SkPaint*) override;
|
|
void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[],
|
|
int, SkBlendMode, const SkRect*, const SkPaint*) override;
|
|
void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override;
|
|
void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override;
|
|
void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override;
|
|
void onClipRegion(const SkRegion& region, SkClipOp) override;
|
|
void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&) override;
|
|
|
|
void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
|
|
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
|
|
|
|
void onDrawEdgeAAQuad(const SkRect&, const SkPoint[4], QuadAAFlags, SkColor,
|
|
SkBlendMode) override;
|
|
void onDrawEdgeAAImageSet(const ImageSetEntry[], int count, const SkPoint[], const SkMatrix[],
|
|
const SkPaint*, SrcRectConstraint) override;
|
|
|
|
private:
|
|
SkTDArray<SkDrawCommand*> fCommandVector;
|
|
SkMatrix fMatrix;
|
|
SkIRect fClip;
|
|
|
|
bool fOverdrawViz;
|
|
SkColor fClipVizColor;
|
|
bool fDrawGpuOpBounds;
|
|
|
|
/**
|
|
Adds the command to the class' vector of commands.
|
|
@param command The draw command for execution
|
|
*/
|
|
void addDrawCommand(SkDrawCommand* command);
|
|
|
|
GrAuditTrail* getAuditTrail(SkCanvas*);
|
|
|
|
void drawAndCollectOps(int n, SkCanvas*);
|
|
void cleanupAuditTrail(SkCanvas*);
|
|
|
|
typedef SkCanvasVirtualEnforcer<SkCanvas> INHERITED;
|
|
};
|
|
|
|
#endif
|