Fix RRect transform bug

src/core/SkRRect.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRRect.h"
 #include "SkMatrix.h"
 
@@ skipping 324 matching lines @@
     }
 
     SkRect newRect;
     if (!matrix.mapRect(&newRect, fRect)) {
         return false;
     }
 
     // At this point, this is guaranteed to succeed, so we can modify dst.
     dst->fRect = newRect;
 
+    // Since the only transforms that were allowed are scale and translate, the type
+    // remains unchanged.
+    dst->fType = fType;
+
+    if (kOval_Type == fType) {
+        for (int i = 0; i < 4; ++i) {
+            dst->fRadii[i].fX = SkScalarHalf(newRect.width());
+            dst->fRadii[i].fY = SkScalarHalf(newRect.height());
+        }
+        SkDEBUGCODE(dst->validate();)
+        return true;
+    }
+
     // Now scale each corner
     SkScalar xScale = matrix.getScaleX();
     const bool flipX = xScale < 0;
     if (flipX) {
         xScale = -xScale;
     }
     SkScalar yScale = matrix.getScaleY();
     const bool flipY = yScale < 0;
     if (flipY) {
         yScale = -yScale;
@@ skipping 15 matching lines @@
             // Only swap in x
             SkTSwap(dst->fRadii[kUpperRight_Corner], dst->fRadii[kUpperLeft_Corner]);
             SkTSwap(dst->fRadii[kLowerRight_Corner], dst->fRadii[kLowerLeft_Corner]);
         }
     } else if (flipY) {
         // Only swap in y
         SkTSwap(dst->fRadii[kUpperLeft_Corner], dst->fRadii[kLowerLeft_Corner]);
         SkTSwap(dst->fRadii[kUpperRight_Corner], dst->fRadii[kLowerRight_Corner]);
     }
 
-    // Since the only transforms that were allowed are scale and translate, the type
-    // remains unchanged.
-    dst->fType = fType;
-
     SkDEBUGCODE(dst->validate();)
 
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkRRect::inset(SkScalar dx, SkScalar dy, SkRRect* dst) const {
     SkRect r = fRect;
 
@@ skipping 110 matching lines @@
             SkASSERT(!patchesOfNine);
             break;
         case kUnknown_Type:
             // no limits on this
             break;
     }
 }
 #endif // SK_DEBUG
 
 ///////////////////////////////////////////////////////////////////////////////