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

src/core/SkBBoxRecord.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 SkBBoxRecord_DEFINED
 #define SkBBoxRecord_DEFINED
@@ skipping 13 matching lines @@
     virtual ~SkBBoxRecord() { }
 
     /**
      * This is called each time we get a bounding box, it will be axis-aligned,
      * in device coordinates, and expanded to include stroking, shadows, etc.
      */
     virtual void handleBBox(const SkRect& bbox) = 0;
 
     virtual void drawOval(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
     virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
+    virtual void drawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
+    virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
     virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
                             const SkPaint& paint) SK_OVERRIDE;
     virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
     virtual void clear(SkColor) SK_OVERRIDE;
     virtual void drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                           const SkPaint& paint) SK_OVERRIDE;
     virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
                             const SkPaint* paint = NULL) SK_OVERRIDE;
     virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
                                       const SkRect& dst, const SkPaint* paint,
@@ skipping 12 matching lines @@
     virtual void drawTextOnPath(const void* text, size_t byteLength,
                                 const SkPath& path, const SkMatrix* matrix,
                                 const SkPaint& paint) SK_OVERRIDE;
     virtual void drawVertices(VertexMode mode, int vertexCount,
                               const SkPoint vertices[], const SkPoint texs[],
                               const SkColor colors[], SkXfermode* xfer,
                               const uint16_t indices[], int indexCount,
                               const SkPaint& paint) SK_OVERRIDE;
     virtual void drawPicture(SkPicture& picture) SK_OVERRIDE;
 
-protected:
-    virtual void onDrawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
-    virtual void onDrawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
-
 private:
     /**
      * Takes a bounding box in current canvas view space, accounts for stroking and effects, and
      * computes an axis-aligned bounding box in device coordinates, then passes it to handleBBox()
      * returns false if the draw is completely clipped out, and may safely be ignored.
      **/
     bool transformBounds(const SkRect& bounds, const SkPaint* paint);
 
     typedef SkPictureRecord INHERITED;
 };
 
 #endif