commit 67baba4892649fdb6fb0827c7d54e5adb7538443
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 02 20:20:31 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 02 20:20:31 2013 +0000
tree 1a184ae6a0d7d53430610827f85d482fa368d8aa
parent ad514302158887002e83625a837f9ecbe540d1d3

Fixed debugger for addition of drawRRect, clipRRect & drawOval

https://codereview.appspot.com/7035051/



git-svn-id: http://skia.googlecode.com/svn/trunk@6975 2bbb7eff-a529-9590-31e7-b0007b416f81

debugger/SkDebugCanvas.h

diff --git a/debugger/SkDebugCanvas.h b/debugger/SkDebugCanvas.h
index 2512702..dc047c5 100644
--- a/debugger/SkDebugCanvas.h
+++ b/debugger/SkDebugCanvas.h
@@ -96,7 +96,7 @@
         Returns length of draw command vector.
      */
     int getSize() {
-        return commandVector.count();
+        return fCommandVector.count();
     }
 
     /**
@@ -128,6 +128,10 @@
 
     virtual bool clipRect(const SkRect&, SkRegion::Op, bool) SK_OVERRIDE;
 
+    virtual bool clipRRect(const SkRRect& rrect,
+                           SkRegion::Op op = SkRegion::kIntersect_Op,
+                           bool doAntiAlias = false) SK_OVERRIDE;
+
     virtual bool clipRegion(const SkRegion& region, SkRegion::Op op) SK_OVERRIDE;
 
     virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE;
@@ -146,6 +150,8 @@
 
     virtual void drawData(const void*, size_t) SK_OVERRIDE;
 
+    virtual void drawOval(const SkRect& oval, const SkPaint&) SK_OVERRIDE;
+
     virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
 
     virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
@@ -159,10 +165,13 @@
                              const SkPoint pos[], const SkPaint&) SK_OVERRIDE;
 
     virtual void drawPosTextH(const void* text, size_t byteLength,
-                      const SkScalar xpos[], SkScalar constY, const SkPaint&) SK_OVERRIDE;
+                              const SkScalar xpos[], SkScalar constY, 
+                              const SkPaint&) SK_OVERRIDE;
 
     virtual void drawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE;
 
+    virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
+
     virtual void drawSprite(const SkBitmap&, int left, int top,
                             const SkPaint*) SK_OVERRIDE;
 
@@ -170,13 +179,13 @@
                           SkScalar y, const SkPaint&) SK_OVERRIDE;
 
     virtual void drawTextOnPath(const void* text, size_t byteLength,
-                            const SkPath& path, const SkMatrix* matrix,
+                                const SkPath& path, const SkMatrix* matrix,
                                 const SkPaint&) SK_OVERRIDE;
 
     virtual void drawVertices(VertexMode, int vertexCount,
-                          const SkPoint vertices[], const SkPoint texs[],
-                          const SkColor colors[], SkXfermode*,
-                          const uint16_t indices[], int indexCount,
+                              const SkPoint vertices[], const SkPoint texs[],
+                              const SkColor colors[], SkXfermode*,
+                              const uint16_t indices[], int indexCount,
                               const SkPaint&) SK_OVERRIDE;
 
     virtual void restore() SK_OVERRIDE;
@@ -197,7 +206,7 @@
 
 private:
     typedef SkCanvas INHERITED;
-    SkTDArray<SkDrawCommand*> commandVector;
+    SkTDArray<SkDrawCommand*> fCommandVector;
     int fHeight;
     int fWidth;
     SkBitmap fBm;