Revert of Add nine patch type to SkRRect.

include/core/SkRRect.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 SkRRect_DEFINED
 #define SkRRect_DEFINED
 
@@ skipping 53 matching lines @@
 
         //!< The RR is actually a (non-empty) oval (i.e., all x radii are equal
         //!< and >= width/2 and all the y radii are equal and >= height/2
         kOval_Type,
 
         //!< The RR is non-empty and all the x radii are equal & all y radii
         //!< are equal but it is not an oval (i.e., there are lines between
         //!< the curves) nor a rect (i.e., both radii are non-zero)
         kSimple_Type,
 
-        //!< The RR is non-empty and the two left x radii are equal, the two top
-        //!< y radii are equal, and the same for the right and bottom but it is
-        //!< neither an rect, oval, nor a simple RR. It is called "nine patch"
-        //!< because the centers of the corner ellipses form an axis aligned
-        //!< rect with edges that divide the RR into an 9 rectangular patches:
-        //!< an interior patch, four edge patches, and four corner patches.
-        kNinePatch_Type,
-
         //!< A fully general (non-empty) RR. Some of the x and/or y radii are
         //!< different from the others and there must be one corner where
         //!< both radii are non-zero.
         kComplex_Type,
     };
 
     /**
      * Returns the RR's sub type.
      */
     Type getType() const {
         SkDEBUGCODE(this->validate();)
 
         if (kUnknown_Type == fType) {
             this->computeType();
         }
         SkASSERT(kUnknown_Type != fType);
         return fType;
     }
 
     Type type() const { return this->getType(); }
 
     inline bool isEmpty() const { return kEmpty_Type == this->getType(); }
     inline bool isRect() const { return kRect_Type == this->getType(); }
     inline bool isOval() const { return kOval_Type == this->getType(); }
     inline bool isSimple() const { return kSimple_Type == this->getType(); }
     inline bool isSimpleCircular() const {
         return this->isSimple() && fRadii[0].fX == fRadii[0].fY;
     }
-    inline bool isNinePatch() const { return kNinePatch_Type == this->getType(); }
     inline bool isComplex() const { return kComplex_Type == this->getType(); }
 
     bool allCornersCircular() const;
 
+    /**
+     * Are both x-radii the same on the two left corners, and similar for the top, right, and
+     * bottom. When this is the case the four ellipse centers form a rectangle.
+     */
+    bool isNinePatch() const {
+        return fRadii[kUpperLeft_Corner].fX == fRadii[kLowerLeft_Corner].fX &&
+               fRadii[kUpperRight_Corner].fX == fRadii[kLowerRight_Corner].fX &&
+               fRadii[kUpperLeft_Corner].fY == fRadii[kUpperRight_Corner].fY &&
+               fRadii[kLowerLeft_Corner].fY == fRadii[kLowerRight_Corner].fY;
+    }
+
     SkScalar width() const { return fRect.width(); }
     SkScalar height() const { return fRect.height(); }
 
     /**
      * Set this RR to the empty rectangle (0,0,0,0) with 0 x & y radii.
      */
     void setEmpty() {
         fRect.setEmpty();
         memset(fRadii, 0, sizeof(fRadii));
         fType = kEmpty_Type;
@@ skipping 38 matching lines @@
 
         SkDEBUGCODE(this->validate();)
     }
 
     /**
      * Initialize the RR with the same radii for all four corners.
      */
     void setRectXY(const SkRect& rect, SkScalar xRad, SkScalar yRad);
 
     /**
-     * Initialize the rr with one radius per-side.
-     */
-    void setNinePatch(const SkRect& rect, SkScalar leftRad, SkScalar topRad,
-                      SkScalar rightRad, SkScalar bottomRad);
-
-    /**
      * Initialize the RR with potentially different radii for all four corners.
      */
     void setRectRadii(const SkRect& rect, const SkVector radii[4]);
 
     // The radii are stored in UL, UR, LR, LL order.
     enum Corner {
         kUpperLeft_Corner,
         kUpperRight_Corner,
         kLowerRight_Corner,
         kLowerLeft_Corner
@@ skipping 112 matching lines @@
     // uninitialized data
 
     void computeType() const;
     bool checkCornerContainment(SkScalar x, SkScalar y) const;
 
     // to access fRadii directly
     friend class SkPath;
 };
 
 #endif