Revert of Simple cleanups related to SkFixed.

include/core/SkRect.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 SkRect_DEFINED
 #define SkRect_DEFINED
 
@@ skipping 445 matching lines @@
      */
     bool isEmpty() const { return fLeft >= fRight || fTop >= fBottom; }
 
     bool isLargest() const { return SK_ScalarMin == fLeft &&
                                     SK_ScalarMin == fTop &&
                                     SK_ScalarMax == fRight &&
                                     SK_ScalarMax == fBottom; }
 
     /**
      *  Returns true iff all values in the rect are finite. If any are
-     *  infinite or NaN then this returns false.
+     *  infinite or NaN (or SK_FixedNaN when SkScalar is fixed) then this
+     *  returns false.
      */
     bool isFinite() const {
         float accum = 0;
         accum *= fLeft;
         accum *= fTop;
         accum *= fRight;
         accum *= fBottom;
 
         // accum is either NaN or it is finite (zero).
         SkASSERT(0 == accum || SkScalarIsNaN(accum));
@@ skipping 421 matching lines @@
     void dumpHex() const { this->dump(true); }
 };
 
 inline bool SkIRect::contains(const SkRect& r) const {
     return  !r.isEmpty() && !this->isEmpty() &&     // check for empties
             (SkScalar)fLeft <= r.fLeft && (SkScalar)fTop <= r.fTop &&
             (SkScalar)fRight >= r.fRight && (SkScalar)fBottom >= r.fBottom;
 }
 
 #endif