Fill SkRRect::fType proactively.

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 34 matching lines @@
         Negative radii are not allowed (they are clamped to zero).
         If the corner curves overlap they will be proportionally reduced to fit.
 */
 class SK_API SkRRect {
 public:
     /**
      * Enum to capture the various possible subtypes of RR. Accessed
      * by type(). The subtypes become progressively less restrictive.
      */
     enum Type {
-        // !< Internal indicator that the sub type must be computed.
-        kUnknown_Type = -1,
-
         // !< The RR is empty
         kEmpty_Type,
 
         //!< The RR is actually a (non-empty) rect (i.e., at least one radius
         //!< at each corner is zero)
         kRect_Type,
 
         //!< 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,
@@ skipping 15 matching lines @@
         //!< 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 static_cast<Type>(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 {
@@ skipping 186 matching lines @@
 
     void dump(bool asHex) const;
     void dump() const { this->dump(false); }
     void dumpHex() const { this->dump(true); }
 
 private:
     SkRect fRect;
     // Radii order is UL, UR, LR, LL. Use Corner enum to index into fRadii[]
     SkVector fRadii[4];
     // use an explicitly sized type so we're sure the class is dense (no uninitialized bytes)
-    mutable int32_t fType;
+    int32_t fType;
     // TODO: add padding so we can use memcpy for flattening and not copy
     // uninitialized data
 
-    void computeType() const;
+    void computeType();
     bool checkCornerContainment(SkScalar x, SkScalar y) const;
 
     // to access fRadii directly
     friend class SkPath;
 };
 
 #endif