commit 2e6024248f81329779a6915c0312f99151d998fd
author robertphillips <robertphillips@google.com> Wed Feb 11 13:07:12 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Feb 11 13:07:13 2015 -0800
tree b899fe04dae4dfe93fe3fc6578d5f45b185051e9
parent 94dff15404a6c82873f3f5092023426937274cc1

Revert of Remove SkPictureFlat.h include from SkDrawCommands.h (patchset #2 id:20001 of https://codereview.chromium.org/912403004/)

Reason for revert:
Chrome

Original issue's description:
> Remove SkPictureFlat.h include from SkDrawCommands.h
>
> Committed: https://skia.googlesource.com/skia/+/5a4c233a3657d12d836de388b41e30405b4ab976

TBR=reed@google.com,fmalita@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/917933002

src/utils/debugger/SkDrawCommand.h

diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h
index 873bb95..d272c54 100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -9,51 +9,13 @@
 #ifndef SKDRAWCOMMAND_H_
 #define SKDRAWCOMMAND_H_
 
+#include "SkPictureFlat.h"
 #include "SkCanvas.h"
 #include "SkString.h"
 
 class SK_API SkDrawCommand {
 public:
-    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,
-
-        kLast_OpType = kSetMatrix_OpType
-    };
-
-    static const int kOpTypeCount = kLast_OpType + 1;
-
-    SkDrawCommand(OpType opType);
+    SkDrawCommand(DrawType drawType);
 
     virtual ~SkDrawCommand();
 
@@ -63,7 +25,7 @@
     size_t offset() const { return fOffset; }
 
     virtual const char* toCString() const {
-        return GetCommandString(fOpType);
+        return GetCommandString(fDrawType);
     }
 
     bool isVisible() const {
@@ -95,17 +57,17 @@
     virtual void setActive(bool active) {}
     virtual bool active() const { return false; }
 
-    OpType getType() const { return fOpType; }
+    DrawType getType() const { return fDrawType; }
 
     virtual bool render(SkCanvas* canvas) const { return false; }
 
-    static const char* GetCommandString(OpType type);
+    static const char* GetCommandString(DrawType type);
 
 protected:
     SkTDArray<SkString*> fInfo;
 
 private:
-    OpType fOpType;
+    DrawType fDrawType;
     size_t fOffset;
     bool   fVisible;
 };
@@ -462,24 +424,6 @@
     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);
@@ -558,6 +502,16 @@
     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();
@@ -590,6 +544,21 @@
     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);
@@ -602,4 +571,30 @@
     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