Handle inverted rects in SkRRect creation methods

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 109 matching lines @@
         memset(fRadii, 0, sizeof(fRadii));
         fType = kEmpty_Type;
 
         SkDEBUGCODE(this->validate();)
     }
 
     /**
      * Set this RR to match the supplied rect. All radii will be 0.
      */
     void setRect(const SkRect& rect) {
-        if (rect.isEmpty()) {
+        fRect = rect;
+        fRect.sort();
+
+        if (fRect.isEmpty()) {
             this->setEmpty();
             return;
         }
 
-        fRect = rect;
         memset(fRadii, 0, sizeof(fRadii));
         fType = kRect_Type;
 
         SkDEBUGCODE(this->validate();)
     }
 
     static SkRRect MakeRect(const SkRect& r) {
         SkRRect rr;
         rr.setRect(r);
         return rr;
     }
     
     static SkRRect MakeOval(const SkRect& oval) {
         SkRRect rr;
         rr.setOval(oval);
         return rr;
     }
 
     /**
      * Set this RR to match the supplied oval. All x radii will equal half the
      * width and all y radii will equal half the height.
      */
     void setOval(const SkRect& oval) {
-        if (oval.isEmpty()) {
+        fRect = oval;
+        fRect.sort();
+
+        if (fRect.isEmpty()) {
             this->setEmpty();
             return;
         }
 
-        SkScalar xRad = SkScalarHalf(oval.width());
-        SkScalar yRad = SkScalarHalf(oval.height());
+        SkScalar xRad = SkScalarHalf(fRect.width());
+        SkScalar yRad = SkScalarHalf(fRect.height());
 
-        fRect = oval;
         for (int i = 0; i < 4; ++i) {
             fRadii[i].set(xRad, yRad);
         }
         fType = kOval_Type;
 
         SkDEBUGCODE(this->validate();)
     }
 
     /**
      * Initialize the RR with the same radii for all four corners.
@@ skipping 137 matching lines @@
     // uninitialized data
 
     void computeType();
     bool checkCornerContainment(SkScalar x, SkScalar y) const;
 
     // to access fRadii directly
     friend class SkPath;
 };
 
 #endif