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

gyp/core.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Include this gypi to include all 'core' files
 # The parent gyp/gypi file must define
 #       'skia_src_path'     e.g. skia/trunk/src
 #       'skia_include_path' e.g. skia/trunk/include
 #
 # The skia build defines these in common_variables.gypi
@@ skipping 174 matching lines @@
         '<(skia_src_path)/core/SkMipMap.cpp',
         '<(skia_src_path)/core/SkMipMap.h',
         '<(skia_src_path)/core/SkMiniRecorder.cpp',
         '<(skia_src_path)/core/SkModeColorFilter.cpp',
         '<(skia_src_path)/core/SkMultiPictureDraw.cpp',
         '<(skia_src_path)/core/SkNextID.h',
         '<(skia_src_path)/core/SkNinePatchIter.cpp',
         '<(skia_src_path)/core/SkNinePatchIter.h',
         '<(skia_src_path)/core/SkNormalSource.cpp',
         '<(skia_src_path)/core/SkNormalSource.h',
+        '<(skia_src_path)/core/SkNx.h',
         '<(skia_src_path)/core/SkOpts.cpp',
         '<(skia_src_path)/core/SkOpts.h',
         '<(skia_src_path)/core/SkOrderedReadBuffer.h',
         '<(skia_src_path)/core/SkPaint.cpp',
         '<(skia_src_path)/core/SkPaintDefaults.h',
         '<(skia_src_path)/core/SkPaintPriv.cpp',
         '<(skia_src_path)/core/SkPaintPriv.h',
         '<(skia_src_path)/core/SkPath.cpp',
         '<(skia_src_path)/core/SkPathEffect.cpp',
         '<(skia_src_path)/core/SkPathMeasure.cpp',
@@ skipping 213 matching lines @@
 
         # private
         '<(skia_include_path)/private/SkAtomics.h',
         '<(skia_include_path)/private/SkChecksum.h',
         '<(skia_include_path)/private/SkFixed.h',
         '<(skia_include_path)/private/SkFloatBits.h',
         '<(skia_include_path)/private/SkFloatingPoint.h',
         '<(skia_include_path)/private/SkGpuFenceSync.h',
         '<(skia_include_path)/private/SkMiniRecorder.h',
         '<(skia_include_path)/private/SkMutex.h',
-        '<(skia_include_path)/private/SkNx.h',
         '<(skia_include_path)/private/SkOnce.h',
         '<(skia_include_path)/private/SkRecords.h',
         '<(skia_include_path)/private/SkSemaphore.h',
         '<(skia_include_path)/private/SkSpinlock.h',
         '<(skia_include_path)/private/SkTemplates.h',
         '<(skia_include_path)/private/SkTArray.h',
         '<(skia_include_path)/private/SkTDArray.h',
         '<(skia_include_path)/private/SkTFitsIn.h',
         '<(skia_include_path)/private/SkTHash.h',
         '<(skia_include_path)/private/SkThreadID.h',
@@ skipping 58 matching lines @@
         '<(skia_src_path)/pathops/SkPathOpsLine.h',
         '<(skia_src_path)/pathops/SkPathOpsPoint.h',
         '<(skia_src_path)/pathops/SkPathOpsQuad.h',
         '<(skia_src_path)/pathops/SkPathOpsRect.h',
         '<(skia_src_path)/pathops/SkPathOpsTSect.h',
         '<(skia_src_path)/pathops/SkPathOpsTypes.h',
         '<(skia_src_path)/pathops/SkPathWriter.h',
         '<(skia_src_path)/pathops/SkReduceOrder.h',
     ],
 }