Revert "If the path is a rect, call drawRect to raster the geometry in SkCanvas::drawPath to get be…

src/utils/debugger/SkDebugCanvas.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 SKDEBUGCANVAS_H_
@@ skipping 171 matching lines @@
     virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
 
     virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
 
     virtual void endCommentGroup() 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;
+
     virtual void drawPicture(SkPicture& picture) SK_OVERRIDE;
 
     virtual void drawPoints(PointMode, size_t count, const SkPoint pts[],
                             const SkPaint&) SK_OVERRIDE;
 
     virtual void drawPosText(const void* text, size_t byteLength,
                              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;
 
+    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;
 
     virtual void drawText(const void* text, size_t byteLength, SkScalar x,
                           SkScalar y, const SkPaint&) SK_OVERRIDE;
 
     virtual void drawTextOnPath(const void* text, size_t byteLength,
                                 const SkPath& path, const SkMatrix* matrix,
@@ skipping 17 matching lines @@
 
     virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE;
 
     virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE;
 
     virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE;
 
     static const int kVizImageHeight = 256;
     static const int kVizImageWidth = 256;
 
-protected:
-    virtual void onDrawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE;
-
-    virtual void onDrawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
-
 private:
     SkTDArray<SkDrawCommand*> fCommandVector;
     int fHeight;
     int fWidth;
     SkBitmap fBm;
     bool fFilter;
     int fIndex;
     SkMatrix fUserMatrix;
     SkMatrix fMatrix;
     SkIRect fClip;
@@ skipping 21 matching lines @@
     /**
         Applies any panning and zooming the user has specified before
         drawing anything else into the canvas.
      */
     void applyUserTransform(SkCanvas* canvas);
 
     typedef SkCanvas INHERITED;
 };
 
 #endif