Revert of try to speed-up maprect + round2i + contains

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
 
 #include "SkPoint.h"
 #include "SkSize.h"
-#include "../private/SkNx.h"
 
 struct SkRect;
 
 /** \struct SkIRect
 
     SkIRect holds four 32 bit integer coordinates for a rectangle
 */
 struct SK_API SkIRect {
     int32_t fLeft, fTop, fRight, fBottom;
 
@@ skipping 839 matching lines @@
         this->round(&ir);
         return ir;
     }
     
     //! Returns the result of calling roundOut(&dst)
     SkIRect roundOut() const {
         SkIRect ir;
         this->roundOut(&ir);
         return ir;
     }
-
-    /**
-     *  Round the rect's values and return the result as a new SkIRect.
-     *  This follows the same semantics as SkScalarRoundToInt().
-     */
-    SkIRect round2i() const {
-        SkIRect dst;
-        Sk4s rd = (Sk4s::Load(&fLeft) + Sk4s(0.5)).floor();
-        SkNx_cast<int32_t>(rd).store(&dst.fLeft);
-        return dst;
-    }
-
-    /**
-     *  Round the rect's values and return the result as a new SkRect.
-     *  This follows the same semantics as SkScalarRoundToScalar().
-     */
-    SkRect round2s() const {
-        SkRect dst;
-        (Sk4s::Load(&fLeft) + Sk4s(0.5)).floor().store(&dst.fLeft);
-        return dst;
-    }
-
+    
     /**
      *  Swap top/bottom or left/right if there are flipped (i.e. if width()
      *  or height() would have returned a negative value.) This should be called
      *  if the edges are computed separately, and may have crossed over each
      *  other. When this returns, left <= right && top <= bottom
      */
     void sort() {
         if (fLeft > fRight) {
             SkTSwap<SkScalar>(fLeft, fRight);
         }
@@ skipping 13 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