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 SKDRAWCOMMAND_H_
|
|
|
|
#define SKDRAWCOMMAND_H_
|
|
|
|
|
2019-04-23 17:05:21 +00:00
|
|
|
#include "include/core/SkBitmap.h"
|
|
|
|
#include "include/core/SkCanvas.h"
|
|
|
|
#include "include/core/SkFlattenable.h"
|
|
|
|
#include "include/core/SkPath.h"
|
|
|
|
#include "include/core/SkRRect.h"
|
|
|
|
#include "include/core/SkRSXform.h"
|
|
|
|
#include "include/core/SkRegion.h"
|
|
|
|
#include "include/core/SkString.h"
|
|
|
|
#include "include/core/SkVertices.h"
|
|
|
|
#include "include/private/SkTDArray.h"
|
|
|
|
#include "src/core/SkDrawShadowInfo.h"
|
|
|
|
#include "src/core/SkTLazy.h"
|
|
|
|
#include "src/utils/SkJSONWriter.h"
|
|
|
|
#include "tools/UrlDataManager.h"
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2019-12-12 16:05:10 +00:00
|
|
|
class DebugLayerManager;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
class DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2015-02-13 19:13:00 +00:00
|
|
|
enum OpType {
|
2015-04-02 03:58:37 +00:00
|
|
|
kBeginDrawPicture_OpType,
|
2018-03-12 14:57:28 +00:00
|
|
|
kClear_OpType,
|
2015-02-13 19:13:00 +00:00
|
|
|
kClipPath_OpType,
|
|
|
|
kClipRegion_OpType,
|
|
|
|
kClipRect_OpType,
|
|
|
|
kClipRRect_OpType,
|
2020-03-10 18:02:56 +00:00
|
|
|
kClipShader_OpType,
|
2015-02-13 19:13:00 +00:00
|
|
|
kConcat_OpType,
|
2016-06-29 01:54:19 +00:00
|
|
|
kDrawAnnotation_OpType,
|
2015-02-13 19:13:00 +00:00
|
|
|
kDrawBitmap_OpType,
|
|
|
|
kDrawBitmapRect_OpType,
|
|
|
|
kDrawDRRect_OpType,
|
2015-07-22 17:23:01 +00:00
|
|
|
kDrawImage_OpType,
|
2017-01-12 21:20:50 +00:00
|
|
|
kDrawImageLattice_OpType,
|
2018-03-12 14:57:28 +00:00
|
|
|
kDrawImageNine_OpType,
|
2015-07-22 17:23:01 +00:00
|
|
|
kDrawImageRect_OpType,
|
2019-12-12 16:05:10 +00:00
|
|
|
kDrawImageRectLayer_OpType, // unique to DebugCanvas
|
2015-02-13 19:13:00 +00:00
|
|
|
kDrawOval_OpType,
|
2018-03-12 14:57:28 +00:00
|
|
|
kDrawArc_OpType,
|
2015-02-13 19:13:00 +00:00
|
|
|
kDrawPaint_OpType,
|
|
|
|
kDrawPatch_OpType,
|
|
|
|
kDrawPath_OpType,
|
|
|
|
kDrawPoints_OpType,
|
|
|
|
kDrawRect_OpType,
|
|
|
|
kDrawRRect_OpType,
|
2018-03-12 14:57:28 +00:00
|
|
|
kDrawRegion_OpType,
|
2018-04-12 16:45:58 +00:00
|
|
|
kDrawShadow_OpType,
|
2015-02-13 19:13:00 +00:00
|
|
|
kDrawTextBlob_OpType,
|
|
|
|
kDrawVertices_OpType,
|
2018-05-29 15:23:35 +00:00
|
|
|
kDrawAtlas_OpType,
|
2018-05-29 18:55:50 +00:00
|
|
|
kDrawDrawable_OpType,
|
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
|
|
|
kDrawEdgeAAQuad_OpType,
|
|
|
|
kDrawEdgeAAImageSet_OpType,
|
2015-04-02 03:58:37 +00:00
|
|
|
kEndDrawPicture_OpType,
|
2015-02-13 19:13:00 +00:00
|
|
|
kRestore_OpType,
|
|
|
|
kSave_OpType,
|
|
|
|
kSaveLayer_OpType,
|
|
|
|
kSetMatrix_OpType,
|
|
|
|
|
2017-05-02 20:49:24 +00:00
|
|
|
kLast_OpType = kSetMatrix_OpType
|
2015-02-13 19:13:00 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const int kOpTypeCount = kLast_OpType + 1;
|
2015-02-12 14:37:12 +00:00
|
|
|
|
2018-08-08 21:03:39 +00:00
|
|
|
static void WritePNG(SkBitmap bitmap, SkWStream& out);
|
2016-03-21 17:19:39 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
DrawCommand(OpType opType);
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
virtual ~DrawCommand() {}
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
bool isVisible() const { return fVisible; }
|
2012-07-31 19:55:32 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
void setVisible(bool toggle) { fVisible = toggle; }
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2014-11-09 00:18:56 +00:00
|
|
|
virtual void execute(SkCanvas*) const = 0;
|
2012-06-29 14:21:22 +00:00
|
|
|
|
2013-06-06 23:59:28 +00:00
|
|
|
virtual bool render(SkCanvas* canvas) const { return false; }
|
2012-11-21 17:11:02 +00:00
|
|
|
|
2019-01-28 18:41:19 +00:00
|
|
|
virtual void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2015-02-13 19:13:00 +00:00
|
|
|
static const char* GetCommandString(OpType type);
|
2012-11-19 20:44:29 +00:00
|
|
|
|
2016-03-03 19:39:38 +00:00
|
|
|
// Helper methods for converting things to JSON
|
2019-01-28 18:41:19 +00:00
|
|
|
static void MakeJsonColor(SkJSONWriter&, const SkColor color);
|
|
|
|
static void MakeJsonColor4f(SkJSONWriter&, const SkColor4f& color);
|
|
|
|
static void MakeJsonPoint(SkJSONWriter&, const SkPoint& point);
|
|
|
|
static void MakeJsonPoint(SkJSONWriter&, SkScalar x, SkScalar y);
|
|
|
|
static void MakeJsonPoint3(SkJSONWriter&, const SkPoint3& point);
|
|
|
|
static void MakeJsonRect(SkJSONWriter&, const SkRect& rect);
|
|
|
|
static void MakeJsonIRect(SkJSONWriter&, const SkIRect&);
|
|
|
|
static void MakeJsonMatrix(SkJSONWriter&, const SkMatrix&);
|
|
|
|
static void MakeJsonPath(SkJSONWriter&, const SkPath& path);
|
|
|
|
static void MakeJsonRegion(SkJSONWriter&, const SkRegion& region);
|
|
|
|
static void MakeJsonPaint(SkJSONWriter&, const SkPaint& paint, UrlDataManager& urlDataManager);
|
|
|
|
static void MakeJsonLattice(SkJSONWriter&, const SkCanvas::Lattice& lattice);
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
static void flatten(const SkFlattenable* flattenable,
|
|
|
|
SkJSONWriter& writer,
|
|
|
|
UrlDataManager& urlDataManager);
|
|
|
|
static bool flatten(const SkImage& image, SkJSONWriter& writer, UrlDataManager& urlDataManager);
|
|
|
|
static bool flatten(const SkBitmap& bitmap,
|
|
|
|
SkJSONWriter& writer,
|
2016-05-04 18:06:28 +00:00
|
|
|
UrlDataManager& urlDataManager);
|
2016-03-03 19:39:38 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2015-02-13 19:13:00 +00:00
|
|
|
OpType fOpType;
|
2014-03-25 23:31:33 +00:00
|
|
|
bool fVisible;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class RestoreCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
RestoreCommand();
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2013-03-22 16:33:31 +00:00
|
|
|
|
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class ClearCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
ClearCommand(SkColor color);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
|
|
|
SkColor fColor;
|
2013-03-22 16:33:31 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class ClipPathCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
ClipPathCommand(const SkPath& path, SkClipOp op, bool doAA);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2016-12-09 14:00:50 +00:00
|
|
|
SkPath fPath;
|
|
|
|
SkClipOp fOp;
|
|
|
|
bool fDoAA;
|
2013-03-17 18:33:46 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class ClipRegionCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
ClipRegionCommand(const SkRegion& region, SkClipOp op);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2016-12-09 14:00:50 +00:00
|
|
|
SkRegion fRegion;
|
|
|
|
SkClipOp fOp;
|
2013-03-22 16:33:31 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class ClipRectCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
ClipRectCommand(const SkRect& rect, SkClipOp op, bool doAA);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2013-03-11 22:53:11 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2016-12-09 14:00:50 +00:00
|
|
|
SkRect fRect;
|
|
|
|
SkClipOp fOp;
|
|
|
|
bool fDoAA;
|
2013-03-22 12:25:30 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class ClipRRectCommand : public DrawCommand {
|
2013-01-02 20:20:31 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
ClipRRectCommand(const SkRRect& rrect, SkClipOp op, bool doAA);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2013-03-11 22:53:11 +00:00
|
|
|
|
2013-01-02 20:20:31 +00:00
|
|
|
private:
|
2016-12-09 14:00:50 +00:00
|
|
|
SkRRect fRRect;
|
|
|
|
SkClipOp fOp;
|
|
|
|
bool fDoAA;
|
2013-03-22 12:25:30 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2013-01-02 20:20:31 +00:00
|
|
|
};
|
|
|
|
|
2020-03-10 18:02:56 +00:00
|
|
|
class ClipShaderCommand : public DrawCommand {
|
|
|
|
public:
|
|
|
|
ClipShaderCommand(sk_sp<SkShader>, SkClipOp);
|
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
sk_sp<SkShader> fShader;
|
|
|
|
SkClipOp fOp;
|
|
|
|
|
|
|
|
typedef DrawCommand INHERITED;
|
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class ConcatCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
ConcatCommand(const SkMatrix& matrix);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2013-03-22 16:33:31 +00:00
|
|
|
SkMatrix fMatrix;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawAnnotationCommand : public DrawCommand {
|
2016-06-29 01:54:19 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawAnnotationCommand(const SkRect&, const char key[], sk_sp<SkData> value);
|
2016-06-29 01:54:19 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-06-29 01:54:19 +00:00
|
|
|
|
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
SkRect fRect;
|
|
|
|
SkString fKey;
|
|
|
|
sk_sp<SkData> fValue;
|
2016-06-29 01:54:19 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2016-06-29 01:54:19 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawImageCommand : public DrawCommand {
|
2015-07-22 17:23:01 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawImageCommand(const SkImage* image, SkScalar left, SkScalar top, const SkPaint* paint);
|
2015-07-22 17:23:01 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2015-07-22 17:23:01 +00:00
|
|
|
private:
|
2016-11-03 20:26:13 +00:00
|
|
|
sk_sp<const SkImage> fImage;
|
|
|
|
SkScalar fLeft;
|
|
|
|
SkScalar fTop;
|
|
|
|
SkTLazy<SkPaint> fPaint;
|
2015-07-22 17:23:01 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2015-07-22 17:23:01 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawImageLatticeCommand : public DrawCommand {
|
2017-01-12 21:20:50 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawImageLatticeCommand(const SkImage* image,
|
|
|
|
const SkCanvas::Lattice& lattice,
|
|
|
|
const SkRect& dst,
|
|
|
|
const SkPaint* paint);
|
2017-01-12 21:20:50 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2017-01-12 21:20:50 +00:00
|
|
|
|
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
sk_sp<const SkImage> fImage;
|
|
|
|
SkCanvas::Lattice fLattice;
|
|
|
|
SkRect fDst;
|
|
|
|
SkTLazy<SkPaint> fPaint;
|
2017-01-12 21:20:50 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2017-01-12 21:20:50 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawImageNineCommand : public DrawCommand {
|
2018-03-12 14:57:28 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawImageNineCommand(const SkImage* image,
|
|
|
|
const SkIRect& center,
|
|
|
|
const SkRect& dst,
|
|
|
|
const SkPaint* paint);
|
2018-03-12 14:57:28 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2018-03-12 14:57:28 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
sk_sp<const SkImage> fImage;
|
|
|
|
SkIRect fCenter;
|
|
|
|
SkRect fDst;
|
2018-05-29 17:38:07 +00:00
|
|
|
SkTLazy<SkPaint> fPaint;
|
2018-03-12 14:57:28 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2018-03-12 14:57:28 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawImageRectCommand : public DrawCommand {
|
2015-07-22 17:23:01 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawImageRectCommand(const SkImage* image,
|
|
|
|
const SkRect* src,
|
|
|
|
const SkRect& dst,
|
|
|
|
const SkPaint* paint,
|
|
|
|
SkCanvas::SrcRectConstraint constraint);
|
2015-07-22 17:23:01 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2015-07-22 17:23:01 +00:00
|
|
|
private:
|
2016-11-03 20:26:13 +00:00
|
|
|
sk_sp<const SkImage> fImage;
|
2015-07-22 17:23:01 +00:00
|
|
|
SkTLazy<SkRect> fSrc;
|
|
|
|
SkRect fDst;
|
|
|
|
SkTLazy<SkPaint> fPaint;
|
|
|
|
SkCanvas::SrcRectConstraint fConstraint;
|
2019-12-12 16:05:10 +00:00
|
|
|
|
|
|
|
typedef DrawCommand INHERITED;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Command for resolving the deferred SkImage representing an android layer
|
|
|
|
// Functions like DrawImageRect except it uses the saved UrlDataManager to resolve the image
|
|
|
|
// at the time execute() is called.
|
|
|
|
class DrawImageRectLayerCommand : public DrawCommand {
|
|
|
|
public:
|
|
|
|
DrawImageRectLayerCommand(DebugLayerManager* layerManager,
|
|
|
|
const int nodeId,
|
|
|
|
const int frame,
|
|
|
|
const SkRect* src,
|
|
|
|
const SkRect& dst,
|
|
|
|
const SkPaint* paint,
|
|
|
|
SkCanvas::SrcRectConstraint constraint);
|
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
DebugLayerManager* fLayerManager;
|
|
|
|
int fNodeId;
|
|
|
|
int fFrame;
|
|
|
|
SkTLazy<SkRect> fSrc;
|
|
|
|
SkRect fDst;
|
|
|
|
SkTLazy<SkPaint> fPaint;
|
|
|
|
SkCanvas::SrcRectConstraint fConstraint;
|
2015-07-22 17:23:01 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2015-07-22 17:23:01 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawOvalCommand : public DrawCommand {
|
2013-01-02 20:20:31 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawOvalCommand(const SkRect& oval, const SkPaint& paint);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2013-01-02 20:20:31 +00:00
|
|
|
private:
|
2013-03-22 12:25:30 +00:00
|
|
|
SkRect fOval;
|
|
|
|
SkPaint fPaint;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2016-08-19 18:25:19 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawArcCommand : public DrawCommand {
|
2016-08-19 18:25:19 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawArcCommand(const SkRect& oval,
|
|
|
|
SkScalar startAngle,
|
|
|
|
SkScalar sweepAngle,
|
|
|
|
bool useCenter,
|
|
|
|
const SkPaint& paint);
|
2016-08-19 18:25:19 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-08-19 18:25:19 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
SkRect fOval;
|
|
|
|
SkScalar fStartAngle;
|
|
|
|
SkScalar fSweepAngle;
|
|
|
|
bool fUseCenter;
|
|
|
|
SkPaint fPaint;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2013-01-02 20:20:31 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawPaintCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawPaintCommand(const SkPaint& paint);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2013-03-22 12:25:30 +00:00
|
|
|
SkPaint fPaint;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-04-19 19:00:47 +00:00
|
|
|
class DrawBehindCommand : public DrawCommand {
|
|
|
|
public:
|
|
|
|
DrawBehindCommand(const SkPaint& paint);
|
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
SkPaint fPaint;
|
|
|
|
|
|
|
|
typedef DrawCommand INHERITED;
|
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawPathCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawPathCommand(const SkPath& path, const SkPaint& paint);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2012-11-21 17:11:02 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
SkPath fPath;
|
|
|
|
SkPaint fPaint;
|
2013-03-17 18:33:46 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class BeginDrawPictureCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
BeginDrawPictureCommand(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint);
|
2015-04-02 03:58:37 +00:00
|
|
|
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2013-11-21 17:08:12 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2016-11-03 20:26:13 +00:00
|
|
|
sk_sp<const SkPicture> fPicture;
|
|
|
|
SkTLazy<SkMatrix> fMatrix;
|
|
|
|
SkTLazy<SkPaint> fPaint;
|
2015-04-02 03:58:37 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2015-04-02 03:58:37 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class EndDrawPictureCommand : public DrawCommand {
|
2015-04-02 03:58:37 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
EndDrawPictureCommand(bool restore);
|
2015-04-02 03:58:37 +00:00
|
|
|
|
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
bool fRestore;
|
2013-03-25 11:50:42 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawPointsCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawPointsCommand(SkCanvas::PointMode mode,
|
|
|
|
size_t count,
|
|
|
|
const SkPoint pts[],
|
|
|
|
const SkPaint& paint);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
|
|
|
SkCanvas::PointMode fMode;
|
2018-05-29 17:38:07 +00:00
|
|
|
SkTDArray<SkPoint> fPts;
|
2013-03-22 12:25:30 +00:00
|
|
|
SkPaint fPaint;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawRegionCommand : public DrawCommand {
|
2018-03-12 14:57:28 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawRegionCommand(const SkRegion& region, const SkPaint& paint);
|
2018-03-12 14:57:28 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2018-03-12 14:57:28 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
SkRegion fRegion;
|
|
|
|
SkPaint fPaint;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2018-03-12 14:57:28 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawTextBlobCommand : public DrawCommand {
|
2014-08-26 14:56:44 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawTextBlobCommand(sk_sp<SkTextBlob> blob, SkScalar x, SkScalar y, const SkPaint& paint);
|
2014-08-26 14:56:44 +00:00
|
|
|
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2014-08-26 14:56:44 +00:00
|
|
|
|
|
|
|
private:
|
2016-09-13 17:00:23 +00:00
|
|
|
sk_sp<SkTextBlob> fBlob;
|
|
|
|
SkScalar fXPos;
|
|
|
|
SkScalar fYPos;
|
|
|
|
SkPaint fPaint;
|
2014-08-26 14:56:44 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2014-08-26 14:56:44 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawPatchCommand : public DrawCommand {
|
2015-02-13 19:13:00 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawPatchCommand(const SkPoint cubics[12],
|
|
|
|
const SkColor colors[4],
|
|
|
|
const SkPoint texCoords[4],
|
|
|
|
SkBlendMode bmode,
|
|
|
|
const SkPaint& paint);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2015-02-13 19:13:00 +00:00
|
|
|
|
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
SkPoint fCubics[12];
|
|
|
|
SkColor* fColorsPtr;
|
|
|
|
SkColor fColors[4];
|
|
|
|
SkPoint* fTexCoordsPtr;
|
|
|
|
SkPoint fTexCoords[4];
|
2016-10-28 19:42:34 +00:00
|
|
|
SkBlendMode fBlendMode;
|
2019-03-20 16:59:00 +00:00
|
|
|
SkPaint fPaint;
|
2015-02-13 19:13:00 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2015-02-13 19:13:00 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawRectCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawRectCommand(const SkRect& rect, const SkPaint& paint);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2013-03-11 22:53:11 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2013-03-17 18:33:46 +00:00
|
|
|
SkRect fRect;
|
|
|
|
SkPaint fPaint;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawRRectCommand : public DrawCommand {
|
2013-01-02 20:20:31 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawRRectCommand(const SkRRect& rrect, const SkPaint& paint);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2013-01-02 20:20:31 +00:00
|
|
|
private:
|
|
|
|
SkRRect fRRect;
|
2013-03-11 22:53:11 +00:00
|
|
|
SkPaint fPaint;
|
2013-03-25 11:50:42 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2013-01-02 20:20:31 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawDRRectCommand : public DrawCommand {
|
2014-02-24 17:28:55 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawDRRectCommand(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2014-02-24 17:28:55 +00:00
|
|
|
private:
|
|
|
|
SkRRect fOuter;
|
|
|
|
SkRRect fInner;
|
|
|
|
SkPaint fPaint;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2014-02-24 17:28:55 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawVerticesCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawVerticesCommand(sk_sp<SkVertices>, SkBlendMode, const SkPaint&);
|
2017-03-17 16:09:04 +00:00
|
|
|
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
sk_sp<SkVertices> fVertices;
|
|
|
|
SkBlendMode fBlendMode;
|
|
|
|
SkPaint fPaint;
|
2013-03-25 11:50:42 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawAtlasCommand : public DrawCommand {
|
2018-05-29 15:23:35 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawAtlasCommand(const SkImage*,
|
|
|
|
const SkRSXform[],
|
|
|
|
const SkRect[],
|
|
|
|
const SkColor[],
|
|
|
|
int,
|
|
|
|
SkBlendMode,
|
|
|
|
const SkRect*,
|
|
|
|
const SkPaint*);
|
2018-05-29 15:23:35 +00:00
|
|
|
|
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
sk_sp<const SkImage> fImage;
|
|
|
|
SkTDArray<SkRSXform> fXform;
|
|
|
|
SkTDArray<SkRect> fTex;
|
|
|
|
SkTDArray<SkColor> fColors;
|
|
|
|
SkBlendMode fBlendMode;
|
|
|
|
SkTLazy<SkRect> fCull;
|
|
|
|
SkTLazy<SkPaint> fPaint;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2018-05-29 15:23:35 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class SaveCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
SaveCommand();
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class SaveLayerCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
SaveLayerCommand(const SkCanvas::SaveLayerRec&);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2013-01-31 15:56:22 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2018-05-29 17:38:07 +00:00
|
|
|
SkTLazy<SkRect> fBounds;
|
|
|
|
SkTLazy<SkPaint> fPaint;
|
|
|
|
sk_sp<const SkImageFilter> fBackdrop;
|
|
|
|
uint32_t fSaveLayerFlags;
|
2013-03-22 16:33:31 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class SetMatrixCommand : public DrawCommand {
|
2012-06-29 14:21:22 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
SetMatrixCommand(const SkMatrix& matrix);
|
2015-03-26 01:17:31 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2016-02-10 13:40:46 +00:00
|
|
|
|
2012-06-29 14:21:22 +00:00
|
|
|
private:
|
2013-02-19 21:00:26 +00:00
|
|
|
SkMatrix fMatrix;
|
2013-03-25 11:50:42 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2012-06-29 14:21:22 +00:00
|
|
|
};
|
2018-04-12 16:45:58 +00:00
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawShadowCommand : public DrawCommand {
|
2018-04-12 16:45:58 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawShadowCommand(const SkPath& path, const SkDrawShadowRec& rec);
|
2018-04-12 16:45:58 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
bool render(SkCanvas* canvas) const override;
|
2019-01-28 18:41:19 +00:00
|
|
|
void toJSON(SkJSONWriter& writer, UrlDataManager& urlDataManager) const override;
|
2018-04-12 16:45:58 +00:00
|
|
|
|
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
SkPath fPath;
|
|
|
|
SkDrawShadowRec fShadowRec;
|
2018-04-12 16:45:58 +00:00
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2018-04-12 16:45:58 +00:00
|
|
|
};
|
2016-08-25 13:30:23 +00:00
|
|
|
|
2019-03-20 18:02:32 +00:00
|
|
|
class DrawDrawableCommand : public DrawCommand {
|
2018-05-29 18:55:50 +00:00
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawDrawableCommand(SkDrawable*, const SkMatrix*);
|
2018-05-29 18:55:50 +00:00
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
sk_sp<SkDrawable> fDrawable;
|
|
|
|
SkTLazy<SkMatrix> fMatrix;
|
|
|
|
|
2019-03-20 16:59:00 +00:00
|
|
|
typedef DrawCommand INHERITED;
|
2018-05-29 18:55:50 +00:00
|
|
|
};
|
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 18:02:32 +00:00
|
|
|
class DrawEdgeAAQuadCommand : public DrawCommand {
|
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
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawEdgeAAQuadCommand(const SkRect& rect,
|
|
|
|
const SkPoint clip[4],
|
|
|
|
SkCanvas::QuadAAFlags aa,
|
2019-08-27 19:25:49 +00:00
|
|
|
const SkColor4f& color,
|
2019-03-20 18:02:32 +00:00
|
|
|
SkBlendMode 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
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
|
|
|
|
private:
|
2019-03-20 16:59:00 +00:00
|
|
|
SkRect fRect;
|
|
|
|
SkPoint fClip[4];
|
|
|
|
int fHasClip;
|
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
|
|
|
SkCanvas::QuadAAFlags fAA;
|
2019-08-27 19:25:49 +00:00
|
|
|
SkColor4f fColor;
|
2019-03-20 16:59:00 +00:00
|
|
|
SkBlendMode fMode;
|
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
|
|
|
typedef DrawCommand INHERITED;
|
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 18:02:32 +00:00
|
|
|
class DrawEdgeAAImageSetCommand : public DrawCommand {
|
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
|
|
|
public:
|
2019-03-20 18:02:32 +00:00
|
|
|
DrawEdgeAAImageSetCommand(const SkCanvas::ImageSetEntry[],
|
|
|
|
int count,
|
|
|
|
const SkPoint[],
|
|
|
|
const SkMatrix[],
|
|
|
|
const SkPaint*,
|
|
|
|
SkCanvas::SrcRectConstraint);
|
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
|
|
|
void execute(SkCanvas* canvas) const override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
SkAutoTArray<SkCanvas::ImageSetEntry> fSet;
|
2019-03-20 16:59:00 +00:00
|
|
|
int fCount;
|
|
|
|
SkAutoTArray<SkPoint> fDstClips;
|
|
|
|
SkAutoTArray<SkMatrix> fPreViewMatrices;
|
|
|
|
SkTLazy<SkPaint> fPaint;
|
|
|
|
SkCanvas::SrcRectConstraint fConstraint;
|
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
|
|
|
typedef DrawCommand INHERITED;
|
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
|
|
|
};
|
2018-05-29 18:55:50 +00:00
|
|
|
#endif
|