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.
|
|
|
|
*/
|
|
|
|
|
2020-12-23 14:16:59 +00:00
|
|
|
#include "tools/debugger/DebugCanvas.h"
|
|
|
|
|
2022-03-30 13:00:12 +00:00
|
|
|
#include "include/core/SkData.h"
|
|
|
|
#include "include/core/SkMatrix.h"
|
2020-08-20 16:33:46 +00:00
|
|
|
#include "include/core/SkPaint.h"
|
|
|
|
#include "include/core/SkPath.h"
|
2019-04-23 17:05:21 +00:00
|
|
|
#include "include/core/SkPicture.h"
|
2020-08-20 16:33:46 +00:00
|
|
|
#include "include/core/SkPoint.h"
|
2022-03-30 13:00:12 +00:00
|
|
|
#include "include/core/SkRSXform.h"
|
|
|
|
#include "include/core/SkShader.h"
|
|
|
|
#include "include/core/SkString.h"
|
2019-04-23 17:05:21 +00:00
|
|
|
#include "include/core/SkTextBlob.h"
|
2022-03-30 13:00:12 +00:00
|
|
|
#include "include/core/SkVertices.h"
|
2020-11-20 18:49:37 +00:00
|
|
|
#include "include/gpu/GrDirectContext.h"
|
2022-03-30 13:00:12 +00:00
|
|
|
#include "include/gpu/GrRecordingContext.h"
|
|
|
|
#include "include/private/SkTArray.h"
|
2019-04-23 17:05:21 +00:00
|
|
|
#include "include/utils/SkPaintFilterCanvas.h"
|
|
|
|
#include "src/core/SkCanvasPriv.h"
|
|
|
|
#include "src/core/SkRectPriv.h"
|
2020-07-10 20:23:47 +00:00
|
|
|
#include "src/gpu/GrRecordingContextPriv.h"
|
2022-03-30 13:00:12 +00:00
|
|
|
#include "src/gpu/GrRenderTargetProxy.h"
|
|
|
|
#include "src/gpu/GrSurfaceProxy.h"
|
2020-12-23 14:16:59 +00:00
|
|
|
#include "src/utils/SkJSONWriter.h"
|
|
|
|
#include "tools/debugger/DebugLayerManager.h"
|
|
|
|
#include "tools/debugger/DrawCommand.h"
|
2016-02-29 19:15:06 +00:00
|
|
|
|
2019-12-12 16:05:10 +00:00
|
|
|
#include <string>
|
2022-03-30 13:00:12 +00:00
|
|
|
#include <utility>
|
|
|
|
|
|
|
|
class SkDrawable;
|
|
|
|
class SkImage;
|
|
|
|
class SkRRect;
|
|
|
|
class SkRegion;
|
|
|
|
class UrlDataManager;
|
|
|
|
struct SkDrawShadowRec;
|
2019-12-12 16:05:10 +00:00
|
|
|
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
|
|
|
#include "src/gpu/GrAuditTrail.h"
|
|
|
|
#endif
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
#define SKDEBUGCANVAS_VERSION 1
|
|
|
|
#define SKDEBUGCANVAS_ATTRIBUTE_VERSION "version"
|
|
|
|
#define SKDEBUGCANVAS_ATTRIBUTE_COMMANDS "commands"
|
|
|
|
#define SKDEBUGCANVAS_ATTRIBUTE_AUDITTRAIL "auditTrail"
|
2016-02-10 20:57:30 +00:00
|
|
|
|
2019-12-12 16:05:10 +00:00
|
|
|
namespace {
|
|
|
|
// Constants used in Annotations by Android for keeping track of layers
|
|
|
|
static constexpr char kOffscreenLayerDraw[] = "OffscreenLayerDraw";
|
|
|
|
static constexpr char kSurfaceID[] = "SurfaceID";
|
2020-01-10 19:38:00 +00:00
|
|
|
static constexpr char kAndroidClip[] = "AndroidDeviceClipRestriction";
|
2020-08-20 16:33:46 +00:00
|
|
|
|
|
|
|
static SkPath arrowHead = SkPath::Polygon({
|
|
|
|
{ 0, 0},
|
|
|
|
{ 6, -15},
|
|
|
|
{ 0, -12},
|
|
|
|
{-6, -15},
|
|
|
|
}, true);
|
|
|
|
|
|
|
|
void drawArrow(SkCanvas* canvas, const SkPoint& a, const SkPoint& b, const SkPaint& paint) {
|
2020-09-02 19:40:37 +00:00
|
|
|
canvas->translate(0.5, 0.5);
|
2020-08-20 16:33:46 +00:00
|
|
|
canvas->drawLine(a, b, paint);
|
|
|
|
canvas->save();
|
|
|
|
canvas->translate(b.fX, b.fY);
|
|
|
|
SkScalar angle = SkScalarATan2((b.fY - a.fY), b.fX - a.fX);
|
|
|
|
canvas->rotate(angle * 180 / SK_ScalarPI - 90);
|
|
|
|
// arrow head
|
|
|
|
canvas->drawPath(arrowHead, paint);
|
|
|
|
canvas->restore();
|
2020-09-02 19:40:37 +00:00
|
|
|
canvas->restore();
|
2020-08-20 16:33:46 +00:00
|
|
|
}
|
2019-12-12 16:05:10 +00:00
|
|
|
} // namespace
|
|
|
|
|
2015-03-26 14:24:48 +00:00
|
|
|
class DebugPaintFilterCanvas : public SkPaintFilterCanvas {
|
|
|
|
public:
|
2019-12-11 20:24:48 +00:00
|
|
|
DebugPaintFilterCanvas(SkCanvas* canvas) : INHERITED(canvas) {}
|
2015-03-26 14:24:48 +00:00
|
|
|
|
|
|
|
protected:
|
2018-08-27 22:11:57 +00:00
|
|
|
bool onFilter(SkPaint& paint) const override {
|
2019-12-11 20:24:48 +00:00
|
|
|
paint.setColor(SK_ColorRED);
|
|
|
|
paint.setAlpha(0x08);
|
|
|
|
paint.setBlendMode(SkBlendMode::kSrcOver);
|
2016-01-11 21:58:29 +00:00
|
|
|
return true;
|
2015-03-26 14:24:48 +00:00
|
|
|
}
|
|
|
|
|
2015-07-13 13:18:39 +00:00
|
|
|
void onDrawPicture(const SkPicture* picture,
|
2019-03-20 16:59:00 +00:00
|
|
|
const SkMatrix* matrix,
|
|
|
|
const SkPaint* paint) override {
|
2015-03-26 14:24:48 +00:00
|
|
|
// We need to replay the picture onto this canvas in order to filter its internal paints.
|
|
|
|
this->SkCanvas::onDrawPicture(picture, matrix, paint);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
2020-09-03 02:42:33 +00:00
|
|
|
using INHERITED = SkPaintFilterCanvas;
|
2015-03-26 14:24:48 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
DebugCanvas::DebugCanvas(int width, int height)
|
2015-01-05 20:58:56 +00:00
|
|
|
: INHERITED(width, height)
|
2013-02-06 20:13:54 +00:00
|
|
|
, fOverdrawViz(false)
|
2016-02-29 19:15:06 +00:00
|
|
|
, fClipVizColor(SK_ColorTRANSPARENT)
|
2019-12-12 16:05:10 +00:00
|
|
|
, fDrawGpuOpBounds(false)
|
2020-01-10 19:38:00 +00:00
|
|
|
, fShowAndroidClip(false)
|
2020-08-20 16:33:46 +00:00
|
|
|
, fShowOrigin(false)
|
2019-12-12 16:05:10 +00:00
|
|
|
, fnextDrawPictureLayerId(-1)
|
2020-01-10 19:38:00 +00:00
|
|
|
, fnextDrawImageRectLayerId(-1)
|
|
|
|
, fAndroidClip(SkRect::MakeEmpty()) {
|
2013-11-07 22:20:31 +00:00
|
|
|
// SkPicturePlayback uses the base-class' quickReject calls to cull clipped
|
|
|
|
// operations. This can lead to problems in the debugger which expects all
|
|
|
|
// the operations in the captured skp to appear in the debug canvas. To
|
|
|
|
// circumvent this we create a wide open clip here (an empty clip rect
|
|
|
|
// is not sufficient).
|
|
|
|
// Internally, the SkRect passed to clipRect is converted to an SkIRect and
|
|
|
|
// rounded out. The following code creates a nearly maximal rect that will
|
|
|
|
// not get collapsed by the coming conversions (Due to precision loss the
|
|
|
|
// inset has to be surprisingly large).
|
2018-01-17 17:20:04 +00:00
|
|
|
SkIRect largeIRect = SkRectPriv::MakeILarge();
|
2013-11-07 22:20:31 +00:00
|
|
|
largeIRect.inset(1024, 1024);
|
2013-11-10 15:08:45 +00:00
|
|
|
SkRect large = SkRect::Make(largeIRect);
|
2013-11-07 22:20:31 +00:00
|
|
|
#ifdef SK_DEBUG
|
2014-11-19 13:03:18 +00:00
|
|
|
SkASSERT(!large.roundOut().isEmpty());
|
2013-11-07 22:20:31 +00:00
|
|
|
#endif
|
2014-02-28 18:19:39 +00:00
|
|
|
// call the base class' version to avoid adding a draw command
|
2020-09-16 17:55:05 +00:00
|
|
|
this->INHERITED::onClipRect(large, SkClipOp::kIntersect, kHard_ClipEdgeStyle);
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2020-07-29 21:26:28 +00:00
|
|
|
DebugCanvas::DebugCanvas(SkIRect bounds)
|
|
|
|
: DebugCanvas(bounds.width(), bounds.height()) {}
|
2019-03-13 17:31:13 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
DebugCanvas::~DebugCanvas() { fCommandVector.deleteAll(); }
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::addDrawCommand(DrawCommand* command) { fCommandVector.push_back(command); }
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::draw(SkCanvas* canvas) {
|
2013-12-04 13:42:46 +00:00
|
|
|
if (!fCommandVector.isEmpty()) {
|
2014-03-25 23:31:33 +00:00
|
|
|
this->drawTo(canvas, fCommandVector.count() - 1);
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::drawTo(SkCanvas* originalCanvas, int index, int m) {
|
2013-01-02 20:20:31 +00:00
|
|
|
SkASSERT(!fCommandVector.isEmpty());
|
|
|
|
SkASSERT(index < fCommandVector.count());
|
2015-01-14 07:09:19 +00:00
|
|
|
|
2016-12-21 22:41:03 +00:00
|
|
|
int saveCount = originalCanvas->save();
|
2015-01-14 07:09:19 +00:00
|
|
|
|
2016-12-21 22:41:03 +00:00
|
|
|
originalCanvas->resetMatrix();
|
2021-07-23 15:48:34 +00:00
|
|
|
SkCanvasPriv::ResetClip(originalCanvas);
|
2013-02-06 20:13:54 +00:00
|
|
|
|
2019-12-11 20:24:48 +00:00
|
|
|
DebugPaintFilterCanvas filterCanvas(originalCanvas);
|
|
|
|
SkCanvas* finalCanvas = fOverdrawViz ? &filterCanvas : originalCanvas;
|
2016-03-29 16:03:52 +00:00
|
|
|
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
2020-11-20 18:49:37 +00:00
|
|
|
auto dContext = GrAsDirectContext(finalCanvas->recordingContext());
|
|
|
|
|
2016-12-20 21:48:59 +00:00
|
|
|
// If we have a GPU backend we can also visualize the op information
|
2016-02-29 19:15:06 +00:00
|
|
|
GrAuditTrail* at = nullptr;
|
2016-12-20 21:48:59 +00:00
|
|
|
if (fDrawGpuOpBounds || m != -1) {
|
2016-12-21 22:41:03 +00:00
|
|
|
// The audit trail must be obtained from the original canvas.
|
|
|
|
at = this->getAuditTrail(originalCanvas);
|
2016-02-29 19:15:06 +00:00
|
|
|
}
|
2021-07-12 20:31:52 +00:00
|
|
|
#endif
|
2014-03-03 16:32:17 +00:00
|
|
|
|
2015-01-14 07:09:19 +00:00
|
|
|
for (int i = 0; i <= index; i++) {
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
2016-12-20 21:14:45 +00:00
|
|
|
GrAuditTrail::AutoCollectOps* acb = nullptr;
|
2016-02-29 19:15:06 +00:00
|
|
|
if (at) {
|
2019-12-11 20:24:48 +00:00
|
|
|
// We need to flush any pending operations, or they might combine with commands below.
|
|
|
|
// Previous operations were not registered with the audit trail when they were
|
|
|
|
// created, so if we allow them to combine, the audit trail will fail to find them.
|
2020-11-20 18:49:37 +00:00
|
|
|
if (dContext) {
|
|
|
|
dContext->flush();
|
|
|
|
}
|
2016-12-20 21:14:45 +00:00
|
|
|
acb = new GrAuditTrail::AutoCollectOps(at, i);
|
2016-02-29 19:15:06 +00:00
|
|
|
}
|
2021-07-12 20:31:52 +00:00
|
|
|
#endif
|
2013-01-02 20:20:31 +00:00
|
|
|
if (fCommandVector[i]->isVisible()) {
|
2019-12-11 20:24:48 +00:00
|
|
|
fCommandVector[i]->execute(finalCanvas);
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
2016-02-29 19:15:06 +00:00
|
|
|
if (at && acb) {
|
|
|
|
delete acb;
|
|
|
|
}
|
2021-07-12 20:31:52 +00:00
|
|
|
#endif
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
2014-03-03 16:32:17 +00:00
|
|
|
|
2016-02-12 20:06:53 +00:00
|
|
|
if (SkColorGetA(fClipVizColor) != 0) {
|
2019-12-11 20:24:48 +00:00
|
|
|
finalCanvas->save();
|
2016-02-12 20:06:53 +00:00
|
|
|
SkPaint clipPaint;
|
|
|
|
clipPaint.setColor(fClipVizColor);
|
2019-12-11 20:24:48 +00:00
|
|
|
finalCanvas->drawPaint(clipPaint);
|
|
|
|
finalCanvas->restore();
|
2016-02-12 20:06:53 +00:00
|
|
|
}
|
|
|
|
|
2020-12-03 16:21:31 +00:00
|
|
|
fMatrix = finalCanvas->getLocalToDevice();
|
2019-12-11 20:24:48 +00:00
|
|
|
fClip = finalCanvas->getDeviceClipBounds();
|
2020-08-20 16:33:46 +00:00
|
|
|
if (fShowOrigin) {
|
|
|
|
const SkPaint originXPaint = SkPaint({1.0, 0, 0, 1.0});
|
|
|
|
const SkPaint originYPaint = SkPaint({0, 1.0, 0, 1.0});
|
|
|
|
// Draw an origin cross at the origin before restoring to assist in visualizing the
|
|
|
|
// current matrix.
|
|
|
|
drawArrow(finalCanvas, {-50, 0}, {50, 0}, originXPaint);
|
|
|
|
drawArrow(finalCanvas, {0, -50}, {0, 50}, originYPaint);
|
|
|
|
}
|
2019-12-11 20:24:48 +00:00
|
|
|
finalCanvas->restoreToCount(saveCount);
|
2015-03-26 14:24:48 +00:00
|
|
|
|
2020-01-10 19:38:00 +00:00
|
|
|
if (fShowAndroidClip) {
|
|
|
|
// Draw visualization of android device clip restriction
|
|
|
|
SkPaint androidClipPaint;
|
|
|
|
androidClipPaint.setARGB(80, 255, 100, 0);
|
|
|
|
finalCanvas->drawRect(fAndroidClip, androidClipPaint);
|
|
|
|
}
|
|
|
|
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
2016-12-20 21:48:59 +00:00
|
|
|
// draw any ops if required and issue a full reset onto GrAuditTrail
|
2016-02-29 19:15:06 +00:00
|
|
|
if (at) {
|
2016-03-04 18:45:05 +00:00
|
|
|
// just in case there is global reordering, we flush the canvas before querying
|
|
|
|
// GrAuditTrail
|
2016-03-08 18:43:41 +00:00
|
|
|
GrAuditTrail::AutoEnable ae(at);
|
2020-11-20 18:49:37 +00:00
|
|
|
if (dContext) {
|
|
|
|
dContext->flush();
|
|
|
|
}
|
2016-03-04 18:45:05 +00:00
|
|
|
|
2016-03-01 22:22:02 +00:00
|
|
|
// we pick three colorblind-safe colors, 75% alpha
|
2019-03-20 16:59:00 +00:00
|
|
|
static const SkColor kTotalBounds = SkColorSetARGB(0xC0, 0x6A, 0x3D, 0x9A);
|
2016-12-20 21:48:59 +00:00
|
|
|
static const SkColor kCommandOpBounds = SkColorSetARGB(0xC0, 0xE3, 0x1A, 0x1C);
|
2019-03-20 16:59:00 +00:00
|
|
|
static const SkColor kOtherOpBounds = SkColorSetARGB(0xC0, 0xFF, 0x7F, 0x00);
|
2016-03-01 22:22:02 +00:00
|
|
|
|
2016-12-21 22:41:03 +00:00
|
|
|
// get the render target of the top device (from the original canvas) so we can ignore ops
|
|
|
|
// drawn offscreen
|
2021-06-03 15:58:43 +00:00
|
|
|
GrRenderTargetProxy* rtp = SkCanvasPriv::TopDeviceTargetProxy(originalCanvas);
|
|
|
|
GrSurfaceProxy::UniqueID proxyID = rtp->uniqueID();
|
2016-03-01 15:15:52 +00:00
|
|
|
|
|
|
|
// get the bounding boxes to draw
|
2016-12-20 21:14:45 +00:00
|
|
|
SkTArray<GrAuditTrail::OpInfo> childrenBounds;
|
2016-03-02 16:32:37 +00:00
|
|
|
if (m == -1) {
|
|
|
|
at->getBoundsByClientID(&childrenBounds, index);
|
|
|
|
} else {
|
2016-12-20 21:48:59 +00:00
|
|
|
// the client wants us to draw the mth op
|
2019-08-22 20:19:24 +00:00
|
|
|
at->getBoundsByOpsTaskID(&childrenBounds.push_back(), m);
|
2016-03-02 16:32:37 +00:00
|
|
|
}
|
2019-12-11 20:24:48 +00:00
|
|
|
// Shift the rects half a pixel, so they appear as exactly 1px thick lines.
|
|
|
|
finalCanvas->save();
|
|
|
|
finalCanvas->translate(0.5, -0.5);
|
2016-02-29 19:15:06 +00:00
|
|
|
SkPaint paint;
|
|
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
|
|
paint.setStrokeWidth(1);
|
|
|
|
for (int i = 0; i < childrenBounds.count(); i++) {
|
2017-05-17 13:36:38 +00:00
|
|
|
if (childrenBounds[i].fProxyUniqueID != proxyID) {
|
2016-03-01 15:15:52 +00:00
|
|
|
// offscreen draw, ignore for now
|
|
|
|
continue;
|
|
|
|
}
|
2016-03-01 22:22:02 +00:00
|
|
|
paint.setColor(kTotalBounds);
|
2019-12-11 20:24:48 +00:00
|
|
|
finalCanvas->drawRect(childrenBounds[i].fBounds, paint);
|
2016-12-20 21:14:45 +00:00
|
|
|
for (int j = 0; j < childrenBounds[i].fOps.count(); j++) {
|
2016-12-20 21:48:59 +00:00
|
|
|
const GrAuditTrail::OpInfo::Op& op = childrenBounds[i].fOps[j];
|
|
|
|
if (op.fClientID != index) {
|
|
|
|
paint.setColor(kOtherOpBounds);
|
2016-02-29 19:15:06 +00:00
|
|
|
} else {
|
2016-12-20 21:48:59 +00:00
|
|
|
paint.setColor(kCommandOpBounds);
|
2016-02-29 19:15:06 +00:00
|
|
|
}
|
2019-12-11 20:24:48 +00:00
|
|
|
finalCanvas->drawRect(op.fBounds, paint);
|
2016-02-29 19:15:06 +00:00
|
|
|
}
|
|
|
|
}
|
2019-12-11 20:24:48 +00:00
|
|
|
finalCanvas->restore();
|
2021-07-12 20:31:52 +00:00
|
|
|
this->cleanupAuditTrail(at);
|
2016-02-29 19:15:06 +00:00
|
|
|
}
|
2021-07-12 20:31:52 +00:00
|
|
|
#endif
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::deleteDrawCommandAt(int index) {
|
2013-04-01 18:18:49 +00:00
|
|
|
SkASSERT(index < fCommandVector.count());
|
|
|
|
delete fCommandVector[index];
|
|
|
|
fCommandVector.remove(index);
|
|
|
|
}
|
|
|
|
|
2020-09-16 14:35:22 +00:00
|
|
|
DrawCommand* DebugCanvas::getDrawCommandAt(int index) const {
|
2013-01-02 20:20:31 +00:00
|
|
|
SkASSERT(index < fCommandVector.count());
|
|
|
|
return fCommandVector[index];
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
2019-03-20 16:59:00 +00:00
|
|
|
GrAuditTrail* DebugCanvas::getAuditTrail(SkCanvas* canvas) {
|
|
|
|
GrAuditTrail* at = nullptr;
|
2020-07-10 20:23:47 +00:00
|
|
|
auto ctx = canvas->recordingContext();
|
2016-04-28 21:32:04 +00:00
|
|
|
if (ctx) {
|
2019-02-08 15:29:20 +00:00
|
|
|
at = ctx->priv().auditTrail();
|
2016-03-10 21:29:36 +00:00
|
|
|
}
|
|
|
|
return at;
|
|
|
|
}
|
2016-03-04 18:45:05 +00:00
|
|
|
|
2019-12-13 18:51:14 +00:00
|
|
|
void DebugCanvas::drawAndCollectOps(SkCanvas* canvas) {
|
2016-03-10 21:29:36 +00:00
|
|
|
GrAuditTrail* at = this->getAuditTrail(canvas);
|
|
|
|
if (at) {
|
|
|
|
// loop over all of the commands and draw them, this is to collect reordering
|
|
|
|
// information
|
2019-12-13 18:51:14 +00:00
|
|
|
for (int i = 0; i < this->getSize(); i++) {
|
2016-12-20 21:14:45 +00:00
|
|
|
GrAuditTrail::AutoCollectOps enable(at, i);
|
2016-03-10 21:29:36 +00:00
|
|
|
fCommandVector[i]->execute(canvas);
|
|
|
|
}
|
2016-03-04 18:45:05 +00:00
|
|
|
|
2016-03-10 21:29:36 +00:00
|
|
|
// in case there is some kind of global reordering
|
|
|
|
{
|
|
|
|
GrAuditTrail::AutoEnable ae(at);
|
2020-11-20 18:49:37 +00:00
|
|
|
|
|
|
|
auto dContext = GrAsDirectContext(canvas->recordingContext());
|
|
|
|
if (dContext) {
|
|
|
|
dContext->flush();
|
|
|
|
}
|
2016-03-04 18:45:05 +00:00
|
|
|
}
|
|
|
|
}
|
2016-03-10 21:29:36 +00:00
|
|
|
}
|
|
|
|
|
2021-07-12 20:31:52 +00:00
|
|
|
void DebugCanvas::cleanupAuditTrail(GrAuditTrail* at) {
|
2016-03-10 21:29:36 +00:00
|
|
|
if (at) {
|
|
|
|
GrAuditTrail::AutoEnable ae(at);
|
|
|
|
at->fullReset();
|
|
|
|
}
|
|
|
|
}
|
2021-08-13 19:21:42 +00:00
|
|
|
#endif // SK_GPU_V1
|
2016-03-10 21:29:36 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::toJSON(SkJSONWriter& writer,
|
|
|
|
UrlDataManager& urlDataManager,
|
|
|
|
SkCanvas* canvas) {
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
2019-12-13 18:51:14 +00:00
|
|
|
this->drawAndCollectOps(canvas);
|
2016-03-29 16:03:52 +00:00
|
|
|
|
2016-03-04 18:45:05 +00:00
|
|
|
// now collect json
|
2016-03-10 21:29:36 +00:00
|
|
|
GrAuditTrail* at = this->getAuditTrail(canvas);
|
2021-07-12 20:31:52 +00:00
|
|
|
#endif
|
2019-01-28 18:41:19 +00:00
|
|
|
writer.appendS32(SKDEBUGCANVAS_ATTRIBUTE_VERSION, SKDEBUGCANVAS_VERSION);
|
|
|
|
writer.beginArray(SKDEBUGCANVAS_ATTRIBUTE_COMMANDS);
|
|
|
|
|
2019-12-13 18:51:14 +00:00
|
|
|
for (int i = 0; i < this->getSize(); i++) {
|
2019-03-20 16:59:00 +00:00
|
|
|
writer.beginObject(); // command
|
2019-01-28 18:41:19 +00:00
|
|
|
this->getDrawCommandAt(i)->toJSON(writer, urlDataManager);
|
2016-03-04 18:45:05 +00:00
|
|
|
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
2019-01-28 18:41:19 +00:00
|
|
|
if (at) {
|
|
|
|
writer.appendName(SKDEBUGCANVAS_ATTRIBUTE_AUDITTRAIL);
|
|
|
|
at->toJson(writer, i);
|
2016-03-04 18:45:05 +00:00
|
|
|
}
|
2021-07-12 20:31:52 +00:00
|
|
|
#endif
|
2019-03-20 16:59:00 +00:00
|
|
|
writer.endObject(); // command
|
2016-03-04 18:45:05 +00:00
|
|
|
}
|
2019-01-28 18:41:19 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
writer.endArray(); // commands
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
|
|
|
this->cleanupAuditTrail(at);
|
|
|
|
#endif
|
2016-03-10 21:29:36 +00:00
|
|
|
}
|
|
|
|
|
2019-12-13 18:51:14 +00:00
|
|
|
void DebugCanvas::toJSONOpsTask(SkJSONWriter& writer, SkCanvas* canvas) {
|
2021-07-12 20:31:52 +00:00
|
|
|
#if SK_GPU_V1
|
2019-12-13 18:51:14 +00:00
|
|
|
this->drawAndCollectOps(canvas);
|
2016-03-10 21:29:36 +00:00
|
|
|
|
2016-03-11 19:45:53 +00:00
|
|
|
GrAuditTrail* at = this->getAuditTrail(canvas);
|
2016-03-04 18:45:05 +00:00
|
|
|
if (at) {
|
2019-08-22 20:19:24 +00:00
|
|
|
GrAuditTrail::AutoManageOpsTask enable(at);
|
2019-01-28 18:41:19 +00:00
|
|
|
at->toJson(writer);
|
2021-07-12 20:31:52 +00:00
|
|
|
this->cleanupAuditTrail(at);
|
|
|
|
return;
|
2016-02-10 20:57:30 +00:00
|
|
|
}
|
2021-07-12 20:31:52 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
writer.beginObject();
|
|
|
|
writer.endObject();
|
2016-02-10 20:57:30 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::setOverdrawViz(bool overdrawViz) { fOverdrawViz = overdrawViz; }
|
2015-03-26 14:24:48 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onClipPath(const SkPath& path, SkClipOp op, ClipEdgeStyle edgeStyle) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new ClipPathCommand(path, op, kSoft_ClipEdgeStyle == edgeStyle));
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onClipRect(const SkRect& rect, SkClipOp op, ClipEdgeStyle edgeStyle) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new ClipRectCommand(rect, op, kSoft_ClipEdgeStyle == edgeStyle));
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle edgeStyle) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new ClipRRectCommand(rrect, op, kSoft_ClipEdgeStyle == edgeStyle));
|
2013-01-02 20:20:31 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onClipRegion(const SkRegion& region, SkClipOp op) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new ClipRegionCommand(region, op));
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2020-03-10 18:02:56 +00:00
|
|
|
void DebugCanvas::onClipShader(sk_sp<SkShader> cs, SkClipOp op) {
|
|
|
|
this->addDrawCommand(new ClipShaderCommand(std::move(cs), op));
|
|
|
|
}
|
|
|
|
|
2021-07-23 15:48:34 +00:00
|
|
|
void DebugCanvas::onResetClip() {
|
|
|
|
this->addDrawCommand(new ResetClipCommand());
|
|
|
|
}
|
|
|
|
|
2020-04-18 14:27:52 +00:00
|
|
|
void DebugCanvas::didConcat44(const SkM44& m) {
|
2020-08-20 16:33:46 +00:00
|
|
|
this->addDrawCommand(new Concat44Command(m));
|
2020-01-10 22:21:40 +00:00
|
|
|
this->INHERITED::didConcat44(m);
|
|
|
|
}
|
|
|
|
|
|
|
|
void DebugCanvas::didScale(SkScalar x, SkScalar y) {
|
2020-11-25 18:37:30 +00:00
|
|
|
this->didConcat44(SkM44::Scale(x, y));
|
2020-01-10 22:21:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void DebugCanvas::didTranslate(SkScalar x, SkScalar y) {
|
2020-11-25 18:37:30 +00:00
|
|
|
this->didConcat44(SkM44::Translate(x, y));
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawAnnotation(const SkRect& rect, const char key[], SkData* value) {
|
2019-12-12 16:05:10 +00:00
|
|
|
// Parse layer-releated annotations added in SkiaPipeline.cpp and RenderNodeDrawable.cpp
|
|
|
|
// the format of the annotations is <Indicator|RenderNodeId>
|
|
|
|
SkTArray<SkString> tokens;
|
|
|
|
SkStrSplit(key, "|", kStrict_SkStrSplitMode, &tokens);
|
|
|
|
if (tokens.size() == 2) {
|
|
|
|
if (tokens[0].equals(kOffscreenLayerDraw)) {
|
2020-08-20 16:33:46 +00:00
|
|
|
// Indicates that the next drawPicture command contains the SkPicture to render the
|
|
|
|
// node at this id in an offscreen buffer.
|
2019-12-12 16:05:10 +00:00
|
|
|
fnextDrawPictureLayerId = std::stoi(tokens[1].c_str());
|
|
|
|
fnextDrawPictureDirtyRect = rect.roundOut();
|
|
|
|
return; // don't record it
|
|
|
|
} else if (tokens[0].equals(kSurfaceID)) {
|
|
|
|
// Indicates that the following drawImageRect should draw the offscreen buffer.
|
|
|
|
fnextDrawImageRectLayerId = std::stoi(tokens[1].c_str());
|
|
|
|
return; // don't record it
|
|
|
|
}
|
|
|
|
}
|
2020-01-10 19:38:00 +00:00
|
|
|
if (strcmp(kAndroidClip, key) == 0) {
|
|
|
|
// Store this frame's android device clip restriction for visualization later.
|
|
|
|
// This annotation stands in place of the androidFramework_setDeviceClipRestriction
|
|
|
|
// which is unrecordable.
|
|
|
|
fAndroidClip = rect;
|
|
|
|
}
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawAnnotationCommand(rect, key, sk_ref_sp(value)));
|
2016-06-29 01:54:19 +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 DebugCanvas::onDrawImage2(const SkImage* image,
|
|
|
|
SkScalar left,
|
|
|
|
SkScalar top,
|
2021-01-19 22:58:25 +00:00
|
|
|
const SkSamplingOptions& sampling,
|
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
|
|
|
const SkPaint* paint) {
|
2021-01-19 22:58:25 +00:00
|
|
|
this->addDrawCommand(new DrawImageCommand(image, left, top, sampling, paint));
|
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 DebugCanvas::onDrawImageLattice2(const SkImage* image,
|
|
|
|
const Lattice& lattice,
|
|
|
|
const SkRect& dst,
|
|
|
|
SkFilterMode filter, // todo
|
|
|
|
const SkPaint* paint) {
|
2021-01-25 16:37:10 +00:00
|
|
|
this->addDrawCommand(new DrawImageLatticeCommand(image, lattice, dst, filter, paint));
|
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 DebugCanvas::onDrawImageRect2(const SkImage* image,
|
|
|
|
const SkRect& src,
|
|
|
|
const SkRect& dst,
|
2021-01-19 22:58:25 +00:00
|
|
|
const SkSamplingOptions& sampling,
|
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
|
|
|
const SkPaint* paint,
|
|
|
|
SrcRectConstraint constraint) {
|
|
|
|
if (fnextDrawImageRectLayerId != -1 && fLayerManager) {
|
|
|
|
// This drawImageRect command would have drawn the offscreen buffer for a layer.
|
|
|
|
// On Android, we recorded an SkPicture of the commands that drew to the layer.
|
|
|
|
// To render the layer as it would have looked on the frame this DebugCanvas draws, we need
|
|
|
|
// to call fLayerManager->getLayerAsImage(id). This must be done just before
|
|
|
|
// drawTo(command), since it depends on the index into the layer's commands
|
|
|
|
// (managed by fLayerManager)
|
|
|
|
// Instead of adding a DrawImageRectCommand, we need a deferred command, that when
|
|
|
|
// executed, will call drawImageRect(fLayerManager->getLayerAsImage())
|
|
|
|
this->addDrawCommand(new DrawImageRectLayerCommand(
|
2021-01-22 03:25:21 +00:00
|
|
|
fLayerManager, fnextDrawImageRectLayerId, fFrame, src, dst, sampling,
|
|
|
|
paint, constraint));
|
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
|
|
|
} else {
|
2021-01-19 22:58:25 +00:00
|
|
|
this->addDrawCommand(new DrawImageRectCommand(image, src, dst, sampling, paint, constraint));
|
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
|
|
|
}
|
|
|
|
// Reset expectation so next drawImageRect is not special.
|
|
|
|
fnextDrawImageRectLayerId = -1;
|
|
|
|
}
|
2015-01-05 15:49:08 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawOval(const SkRect& oval, const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawOvalCommand(oval, paint));
|
2013-01-02 20:20:31 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawArc(const SkRect& oval,
|
|
|
|
SkScalar startAngle,
|
|
|
|
SkScalar sweepAngle,
|
|
|
|
bool useCenter,
|
|
|
|
const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawArcCommand(oval, startAngle, sweepAngle, useCenter, paint));
|
2016-08-19 18:25:19 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawPaint(const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawPaintCommand(paint));
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-04-19 19:00:47 +00:00
|
|
|
void DebugCanvas::onDrawBehind(const SkPaint& paint) {
|
|
|
|
this->addDrawCommand(new DrawBehindCommand(paint));
|
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawPathCommand(path, paint));
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawRegion(const SkRegion& region, const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawRegionCommand(region, paint));
|
2018-03-12 14:57:28 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawPicture(const SkPicture* picture,
|
|
|
|
const SkMatrix* matrix,
|
|
|
|
const SkPaint* paint) {
|
2019-12-12 16:05:10 +00:00
|
|
|
if (fnextDrawPictureLayerId != -1 && fLayerManager) {
|
|
|
|
fLayerManager->storeSkPicture(fnextDrawPictureLayerId, fFrame, sk_ref_sp(picture),
|
|
|
|
fnextDrawPictureDirtyRect);
|
|
|
|
} else {
|
|
|
|
this->addDrawCommand(new BeginDrawPictureCommand(picture, matrix, paint));
|
|
|
|
SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->cullRect());
|
|
|
|
picture->playback(this);
|
|
|
|
this->addDrawCommand(new EndDrawPictureCommand(SkToBool(matrix) || SkToBool(paint)));
|
|
|
|
}
|
|
|
|
fnextDrawPictureLayerId = -1;
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawPoints(PointMode mode,
|
|
|
|
size_t count,
|
|
|
|
const SkPoint pts[],
|
|
|
|
const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawPointsCommand(mode, count, pts, paint));
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
|
2012-06-29 14:21:22 +00:00
|
|
|
// NOTE(chudy): Messing up when renamed to DrawRect... Why?
|
2019-03-20 18:02:32 +00:00
|
|
|
addDrawCommand(new DrawRectCommand(rect, paint));
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawRRectCommand(rrect, paint));
|
2013-01-02 20:20:31 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawDRRectCommand(outer, inner, paint));
|
2014-02-21 12:20:45 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawTextBlob(const SkTextBlob* blob,
|
|
|
|
SkScalar x,
|
|
|
|
SkScalar y,
|
|
|
|
const SkPaint& paint) {
|
|
|
|
this->addDrawCommand(
|
2019-03-20 18:02:32 +00:00
|
|
|
new DrawTextBlobCommand(sk_ref_sp(const_cast<SkTextBlob*>(blob)), x, y, paint));
|
2014-08-26 14:56:44 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawPatch(const SkPoint cubics[12],
|
|
|
|
const SkColor colors[4],
|
|
|
|
const SkPoint texCoords[4],
|
|
|
|
SkBlendMode bmode,
|
|
|
|
const SkPaint& paint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawPatchCommand(cubics, colors, texCoords, bmode, paint));
|
2015-02-13 19:13:00 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawVerticesObject(const SkVertices* vertices,
|
|
|
|
SkBlendMode bmode,
|
|
|
|
const SkPaint& paint) {
|
|
|
|
this->addDrawCommand(
|
2019-03-20 18:02:32 +00:00
|
|
|
new DrawVerticesCommand(sk_ref_sp(const_cast<SkVertices*>(vertices)), bmode, paint));
|
2012-06-29 14:21:22 +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 DebugCanvas::onDrawAtlas2(const SkImage* image,
|
|
|
|
const SkRSXform xform[],
|
|
|
|
const SkRect tex[],
|
|
|
|
const SkColor colors[],
|
|
|
|
int count,
|
|
|
|
SkBlendMode bmode,
|
|
|
|
const SkSamplingOptions& sampling,
|
|
|
|
const SkRect* cull,
|
|
|
|
const SkPaint* paint) {
|
2019-03-20 16:59:00 +00:00
|
|
|
this->addDrawCommand(
|
2021-01-25 16:37:10 +00:00
|
|
|
new DrawAtlasCommand(image, xform, tex, colors, count, bmode, sampling, cull, paint));
|
2018-05-29 15:23:35 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawShadowRec(const SkPath& path, const SkDrawShadowRec& rec) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawShadowCommand(path, rec));
|
2018-04-12 16:45:58 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawDrawableCommand(drawable, matrix));
|
2018-05-29 18:55:50 +00:00
|
|
|
}
|
|
|
|
|
2019-08-27 19:25:49 +00:00
|
|
|
void DebugCanvas::onDrawEdgeAAQuad(const SkRect& rect,
|
|
|
|
const SkPoint clip[4],
|
|
|
|
QuadAAFlags aa,
|
|
|
|
const SkColor4f& color,
|
|
|
|
SkBlendMode mode) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawEdgeAAQuadCommand(rect, clip, aa, color, mode));
|
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
|
|
|
}
|
|
|
|
|
2021-01-05 17:03:47 +00:00
|
|
|
void DebugCanvas::onDrawEdgeAAImageSet2(const ImageSetEntry set[],
|
|
|
|
int count,
|
|
|
|
const SkPoint dstClips[],
|
|
|
|
const SkMatrix preViewMatrices[],
|
|
|
|
const SkSamplingOptions& sampling,
|
|
|
|
const SkPaint* paint,
|
|
|
|
SrcRectConstraint constraint) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new DrawEdgeAAImageSetCommand(
|
2021-01-05 17:03:47 +00:00
|
|
|
set, count, dstClips, preViewMatrices, sampling, paint, constraint));
|
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
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::willRestore() {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new RestoreCommand());
|
2014-03-12 20:21:48 +00:00
|
|
|
this->INHERITED::willRestore();
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::willSave() {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new SaveCommand());
|
2014-06-30 14:13:28 +00:00
|
|
|
this->INHERITED::willSave();
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
SkCanvas::SaveLayerStrategy DebugCanvas::getSaveLayerStrategy(const SaveLayerRec& rec) {
|
2019-03-20 18:02:32 +00:00
|
|
|
this->addDrawCommand(new SaveLayerCommand(rec));
|
2015-12-18 15:09:18 +00:00
|
|
|
(void)this->INHERITED::getSaveLayerStrategy(rec);
|
2014-03-12 20:21:48 +00:00
|
|
|
// No need for a full layer.
|
|
|
|
return kNoLayer_SaveLayerStrategy;
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
bool DebugCanvas::onDoSaveBehind(const SkRect* subset) {
|
2018-12-18 22:38:18 +00:00
|
|
|
// TODO
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-11-25 18:37:30 +00:00
|
|
|
void DebugCanvas::didSetM44(const SkM44& matrix) {
|
|
|
|
this->addDrawCommand(new SetM44Command(matrix));
|
|
|
|
this->INHERITED::didSetM44(matrix);
|
|
|
|
}
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void DebugCanvas::toggleCommand(int index, bool toggle) {
|
2013-01-02 20:20:31 +00:00
|
|
|
SkASSERT(index < fCommandVector.count());
|
|
|
|
fCommandVector[index]->setVisible(toggle);
|
2012-06-29 14:21:22 +00:00
|
|
|
}
|
2020-09-16 14:35:22 +00:00
|
|
|
|
|
|
|
std::map<int, std::vector<int>> DebugCanvas::getImageIdToCommandMap(UrlDataManager& udm) const {
|
|
|
|
// map from image ids to list of commands that reference them.
|
|
|
|
std::map<int, std::vector<int>> m;
|
|
|
|
|
|
|
|
for (int i = 0; i < this->getSize(); i++) {
|
|
|
|
const DrawCommand* command = this->getDrawCommandAt(i);
|
|
|
|
int imageIndex = -1;
|
|
|
|
// this is not an exaustive list of where images can be used, they show up in paints too.
|
|
|
|
switch (command->getOpType()) {
|
|
|
|
case DrawCommand::OpType::kDrawImage_OpType: {
|
|
|
|
imageIndex = static_cast<const DrawImageCommand*>(command)->imageId(udm);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case DrawCommand::OpType::kDrawImageRect_OpType: {
|
|
|
|
imageIndex = static_cast<const DrawImageRectCommand*>(command)->imageId(udm);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case DrawCommand::OpType::kDrawImageLattice_OpType: {
|
|
|
|
imageIndex = static_cast<const DrawImageLatticeCommand*>(command)->imageId(udm);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default: break;
|
|
|
|
}
|
|
|
|
if (imageIndex >= 0) {
|
|
|
|
m[imageIndex].push_back(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return m;
|
|
|
|
}
|