Remove SkPictureFlat.h include from SkDrawCommands.h

src/utils/debugger/SkDrawCommand.h

 
 /*
  * 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_
 
-#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();
 
     virtual SkString toString() const;
 
     void setOffset(size_t offset) { fOffset = offset; }
     size_t offset() const { return fOffset; }
 
     virtual const char* toCString() const {
-        return GetCommandString(fDrawType);
+        return GetCommandString(fOpType);
     }
 
     bool isVisible() const {
         return fVisible;
     }
 
     void setVisible(bool toggle) {
         fVisible = toggle;
     }
 
@@ skipping 11 matching lines @@
     //      saveLayers return kPushLayer but also track the active state
     enum Action {
         kNone_Action,
         kPopLayer_Action,
         kPushLayer_Action,
     };
     virtual Action action() const { return kNone_Action; }
     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;
 };
 
 class SkRestoreCommand : public SkDrawCommand {
 public:
     SkRestoreCommand();
     void execute(SkCanvas* canvas) const SK_OVERRIDE;
     Action action() const SK_OVERRIDE { return kPopLayer_Action; }
 
@@ skipping 326 matching lines @@
 
 private:
     SkAutoTUnref<const SkTextBlob> fBlob;
     SkScalar                       fXPos;
     SkScalar                       fYPos;
     SkPaint                        fPaint;
 
     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);
     void execute(SkCanvas* canvas) const SK_OVERRIDE;
 
     const SkRect& rect() const   { return fRect; }
     const SkPaint& paint() const { return fPaint; }
 private:
     SkRect  fRect;
     SkPaint fPaint;
@@ skipping 58 matching lines @@
     SkPoint*    fTexs;
     SkColor*    fColors;
     SkXfermode* fXfermode;
     uint16_t*   fIndices;
     int         fIndexCount;
     SkPaint     fPaint;
 
     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();
     void execute(SkCanvas* canvas) const SK_OVERRIDE;
     Action action() const SK_OVERRIDE { return kPushLayer_Action; }
 private:
     typedef SkDrawCommand INHERITED;
 };
 
 class SkSaveLayerCommand : public SkDrawCommand {
@@ skipping 12 matching lines @@
     SkRect              fBounds;
     SkPaint             fPaint;
     SkPaint*            fPaintPtr;
     SkCanvas::SaveFlags fFlags;
 
     bool                fActive;
 
     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);
     void setUserMatrix(const SkMatrix&) SK_OVERRIDE;
     void execute(SkCanvas* canvas) const SK_OVERRIDE;
 private:
     SkMatrix fUserMatrix;
     SkMatrix fMatrix;
 
     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