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

include/core/SkCanvas.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkCanvas_DEFINED
@@ skipping 557 matching lines @@
         @param y1    The y-coordinate of the end point of the line
         @param paint The paint used to draw the line
     */
     void drawLine(SkScalar x0, SkScalar y0, SkScalar x1, SkScalar y1,
                   const SkPaint& paint);
 
     /** Draw the specified rectangle using the specified paint. The rectangle
         will be filled or stroked based on the Style in the paint.
         @param rect     The rect to be drawn
         @param paint    The paint used to draw the rect
-
-        Overriding this function is deprecated. It will be made non-virtual
-        soon. Instead override onDrawRect.
     */
-    virtual void drawRect(const SkRect& rect, const SkPaint& paint) {
-        this->onDrawRect(rect, paint);
-    }
+    virtual void drawRect(const SkRect& rect, const SkPaint& paint);
 
     /** Draw the specified rectangle using the specified paint. The rectangle
         will be filled or framed based on the Style in the paint.
         @param rect     The rect to be drawn
         @param paint    The paint used to draw the rect
     */
-    void drawIRect(const SkIRect& rect, const SkPaint& paint) {
+    void drawIRect(const SkIRect& rect, const SkPaint& paint)
+    {
         SkRect r;
         r.set(rect);    // promotes the ints to scalars
         this->drawRect(r, paint);
     }
 
     /** Draw the specified rectangle using the specified paint. The rectangle
         will be filled or framed based on the Style in the paint.
         @param left     The left side of the rectangle to be drawn
         @param top      The top side of the rectangle to be drawn
         @param right    The right side of the rectangle to be drawn
@@ skipping 51 matching lines @@
         @param ry       The y-radius of the oval used to round the corners
         @param paint    The paint used to draw the roundRect
     */
     void drawRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry,
                        const SkPaint& paint);
 
     /** Draw the specified path using the specified paint. The path will be
         filled or framed based on the Style in the paint.
         @param path     The path to be drawn
         @param paint    The paint used to draw the path
-
-        Overriding this function is deprecated. It will be made non-virtual
-        soon. Instead override onDrawRect.
     */
-    virtual void drawPath(const SkPath& path, const SkPaint& paint) {
-        SkRect rect;
-        if (path.isRect(&rect) && !path.isInverseFillType()) {
-            this->onDrawRect(rect, paint);
-        } else {
-            this->onDrawPath(path, paint);
-        }
-    }
+    virtual void drawPath(const SkPath& path, const SkPaint& paint);
 
     /** Draw the specified bitmap, with its top/left corner at (x,y), using the
         specified paint, transformed by the current matrix. Note: if the paint
         contains a maskfilter that generates a mask which extends beyond the
         bitmap's original width/height, then the bitmap will be drawn as if it
         were in a Shader with CLAMP mode. Thus the color outside of the original
         width/height will be the edge color replicated.
         @param bitmap   The bitmap to be drawn
         @param left     The position of the left side of the bitmap being drawn
         @param top      The position of the top side of the bitmap being drawn
@@ skipping 356 matching lines @@
 
     // Called by child classes that override clipPath and clipRRect to only
     // track fast conservative clip bounds, rather than exact clips.
     bool updateClipConservativelyUsingBounds(const SkRect&, SkRegion::Op,
                                              bool inverseFilled);
 
     // notify our surface (if we have one) that we are about to draw, so it
     // can perform copy-on-write or invalidate any cached images
     void predrawNotify();
 
-    virtual void onDrawRect(const SkRect& rect, const SkPaint& paint);
-
-    virtual void onDrawPath(const SkPath& path, const SkPaint& paint);
-
     /** DEPRECATED -- use constructor(device)
 
      Marked as 'protected' to avoid new clients using this before we can
      completely remove it.
 
      Specify a device for this canvas to draw into. If it is not null, its
      reference count is incremented. If the canvas was already holding a
      device, its reference count is decremented. The new device is returned.
      */
     virtual SkBaseDevice* setDevice(SkBaseDevice* device);
@@ skipping 143 matching lines @@
         if (NULL != fCanvas) {
             fCanvas->endCommentGroup();
         }
     }
 
 private:
     SkCanvas* fCanvas;
 };
 
 #endif