Remove SkPictureFlat.h include from SkDrawCommands.h
This cannot land until https://codereview.chromium.org/909353004/ (Prepare SkiaBenchmarkingExtensionTest for upcoming Skia changes) lands in Chromium
Committed: https://skia.googlesource.com/skia/+/5a4c233a3657d12d836de388b41e30405b4ab976
Committed: https://skia.googlesource.com/skia/+/fa3a83d0fe53907e618346d3f1c17a95da1a9d22
Review URL: https://codereview.chromium.org/912403004
diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h
index ab72a88..9ff1a9f 100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -9,29 +9,56 @@
#ifndef SKDRAWCOMMAND_H_
#define SKDRAWCOMMAND_H_
-#include "SkPictureFlat.h"
#include "SkCanvas.h"
#include "SkString.h"
class SK_API SkDrawCommand {
public:
// Staging for Chromium
- typedef DrawType OpType;
-
- static const int kOpTypeCount = LAST_DRAWTYPE_ENUM+1;
-
static const char* kDrawRectString;
static const char* kClipRectString;
-
- static const OpType kSave_OpType;
- static const OpType kClipRect_OpType;
- static const OpType kDrawRect_OpType;
- static const OpType kRestore_OpType;
- static const OpType kSetMatrix_OpType;
// End Staging
+ enum OpType {
+ kBeginCommentGroup_OpType,
+ kClipPath_OpType,
+ kClipRegion_OpType,
+ kClipRect_OpType,
+ kClipRRect_OpType,
+ kComment_OpType,
+ kConcat_OpType,
+ kDrawBitmap_OpType,
+ kDrawBitmapNine_OpType,
+ kDrawBitmapRect_OpType,
+ kDrawClear_OpType,
+ kDrawDRRect_OpType,
+ kDrawOval_OpType,
+ kDrawPaint_OpType,
+ kDrawPatch_OpType,
+ kDrawPath_OpType,
+ kDrawPicture_OpType,
+ kDrawPoints_OpType,
+ kDrawPosText_OpType,
+ kDrawPosTextH_OpType,
+ kDrawRect_OpType,
+ kDrawRRect_OpType,
+ kDrawSprite_OpType,
+ kDrawText_OpType,
+ kDrawTextBlob_OpType,
+ kDrawTextOnPath_OpType,
+ kDrawVertices_OpType,
+ kEndCommentGroup_OpType,
+ kRestore_OpType,
+ kSave_OpType,
+ kSaveLayer_OpType,
+ kSetMatrix_OpType,
- SkDrawCommand(DrawType drawType);
+ kLast_OpType = kSetMatrix_OpType
+ };
+
+ static const int kOpTypeCount = kLast_OpType + 1;
+
+ SkDrawCommand(OpType opType);
virtual ~SkDrawCommand();
@@ -41,7 +68,7 @@
size_t offset() const { return fOffset; }
virtual const char* toCString() const {
- return GetCommandString(fDrawType);
+ return GetCommandString(fOpType);
}
bool isVisible() const {
@@ -73,17 +100,17 @@
virtual void setActive(bool active) {}
virtual bool active() const { return false; }
- DrawType getType() const { return fDrawType; }
+ OpType getType() const { return fOpType; }
virtual bool render(SkCanvas* canvas) const { return false; }
- static const char* GetCommandString(DrawType type);
+ static const char* GetCommandString(OpType type);
protected:
SkTDArray<SkString*> fInfo;
private:
- DrawType fDrawType;
+ OpType fOpType;
size_t fOffset;
bool fVisible;
};
@@ -430,6 +457,24 @@
typedef SkDrawCommand INHERITED;
};
+class SkDrawPatchCommand : public SkDrawCommand {
+public:
+ SkDrawPatchCommand(const SkPoint cubics[12], const SkColor colors[4],
+ const SkPoint texCoords[4], SkXfermode* xmode,
+ const SkPaint& paint);
+ void execute(SkCanvas* canvas) const SK_OVERRIDE;
+
+private:
+ SkPoint fCubics[12];
+ SkColor fColors[4];
+ SkPoint fTexCoords[4];
+ SkAutoTUnref<SkXfermode> fXfermode;
+ SkPaint fPaint;
+
+ typedef SkDrawCommand INHERITED;
+};
+
+
class SkDrawRectCommand : public SkDrawCommand {
public:
SkDrawRectCommand(const SkRect& rect, const SkPaint& paint);
@@ -508,16 +553,6 @@
typedef SkDrawCommand INHERITED;
};
-class SkRotateCommand : public SkDrawCommand {
-public:
- SkRotateCommand(SkScalar degrees);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
-private:
- SkScalar fDegrees;
-
- typedef SkDrawCommand INHERITED;
-};
-
class SkSaveCommand : public SkDrawCommand {
public:
SkSaveCommand();
@@ -550,21 +585,6 @@
typedef SkDrawCommand INHERITED;
};
-class SkScaleCommand : public SkDrawCommand {
-public:
- SkScaleCommand(SkScalar sx, SkScalar sy);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
-
- SkScalar x() const { return fSx; }
- SkScalar y() const { return fSy; }
-
-private:
- SkScalar fSx;
- SkScalar fSy;
-
- typedef SkDrawCommand INHERITED;
-};
-
class SkSetMatrixCommand : public SkDrawCommand {
public:
SkSetMatrixCommand(const SkMatrix& matrix);
@@ -577,30 +597,4 @@
typedef SkDrawCommand INHERITED;
};
-class SkSkewCommand : public SkDrawCommand {
-public:
- SkSkewCommand(SkScalar sx, SkScalar sy);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
-private:
- SkScalar fSx;
- SkScalar fSy;
-
- typedef SkDrawCommand INHERITED;
-};
-
-class SkTranslateCommand : public SkDrawCommand {
-public:
- SkTranslateCommand(SkScalar dx, SkScalar dy);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
-
- SkScalar x() const { return fDx; }
- SkScalar y() const { return fDy; }
-
-private:
- SkScalar fDx;
- SkScalar fDy;
-
- typedef SkDrawCommand INHERITED;
-};
-
#endif