Revert of Add SkRacy

include/core/SkMatrix.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkMatrix_DEFINED
 #define SkMatrix_DEFINED
 
-#include "SkDynamicAnnotations.h"
 #include "SkRect.h"
 
 class SkString;
 
 // TODO: can we remove these 3 (need to check chrome/android)
 typedef SkScalar SkPersp;
 #define SkScalarToPersp(x) (x)
 #define SkPerspToScalar(x) (x)
 
 /** \class SkMatrix
@@ skipping 613 matching lines @@
                         kPerspective_Mask,
 
         kAllMasks = kTranslate_Mask |
                     kScale_Mask |
                     kAffine_Mask |
                     kPerspective_Mask |
                     kRectStaysRect_Mask
     };
 
     SkScalar         fMat[9];
-    mutable SkTRacy<uint32_t> fTypeMask;
+    mutable uint32_t fTypeMask;
 
     uint8_t computeTypeMask() const;
     uint8_t computePerspectiveTypeMask() const;
 
     void setTypeMask(int mask) {
         // allow kUnknown or a valid mask
         SkASSERT(kUnknown_Mask == mask || (mask & kAllMasks) == mask ||
                  ((kUnknown_Mask | kOnlyPerspectiveValid_Mask) & mask)
                  == (kUnknown_Mask | kOnlyPerspectiveValid_Mask));
         fTypeMask = SkToU8(mask);
     }
 
     void orTypeMask(int mask) {
         SkASSERT((mask & kORableMasks) == mask);
         fTypeMask = SkToU8(fTypeMask | mask);
     }
 
     void clearTypeMask(int mask) {
         // only allow a valid mask
         SkASSERT((mask & kAllMasks) == mask);
-        fTypeMask = fTypeMask & ~mask;
+        fTypeMask &= ~mask;
     }
 
     TypeMask getPerspectiveTypeMaskOnly() const {
         if ((fTypeMask & kUnknown_Mask) &&
             !(fTypeMask & kOnlyPerspectiveValid_Mask)) {
             fTypeMask = this->computePerspectiveTypeMask();
         }
         return (TypeMask)(fTypeMask & 0xF);
     }
 
@@ skipping 32 matching lines @@
     static void RotTrans_pts(const SkMatrix&, SkPoint dst[], const SkPoint[],
                              int count);
     static void Persp_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
 
     static const MapPtsProc gMapPtsProcs[];
 
     friend class SkPerspIter;
 };
 
 #endif