Upstream changes from Android.

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 170 matching lines @@
      *  When a rrect is simple, all of its radii are equal. This returns one
      *  of those radii. This call requires the rrect to be non-complex.
      */
     const SkVector& getSimpleRadii() const {
         SkASSERT(!this->isComplex());
         return fRadii[0];
     }
 
     friend bool operator==(const SkRRect& a, const SkRRect& b) {
         return a.fRect == b.fRect &&
-               SkScalarsEqual((SkScalar*) a.fRadii, (SkScalar*) b.fRadii, 8);
+               SkScalarsEqual(a.fRadii[0].asScalars(),
+                              b.fRadii[0].asScalars(), 8);
     }
 
     friend bool operator!=(const SkRRect& a, const SkRRect& b) {
         return a.fRect != b.fRect ||
-               !SkScalarsEqual((SkScalar*) a.fRadii, (SkScalar*) b.fRadii, 8);
+               !SkScalarsEqual(a.fRadii[0].asScalars(),
+                               b.fRadii[0].asScalars(), 8);
     }
 
     /**
      *  Returns true if (p.fX,p.fY) is inside the RR, and the RR
      *  is not empty.
      *
      *  Contains treats the left and top differently from the right and bottom.
      *  The left and top coordinates of the RR are themselves considered
      *  to be inside, while the right and bottom are not. All the points on the
      *  edges of the corners are considered to be inside.
@@ skipping 70 matching lines @@
     // TODO: add padding so we can use memcpy for flattening and not copy
     // uninitialized data
 
     void computeType() const;
 
     // to access fRadii directly
     friend class SkPath;
 };
 
 #endif