Revert of Refactoring of CPU NormalMap handling out into its own class

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 136 matching lines @@
         '<(skia_src_path)/core/SkImageFilterCache.cpp',
         '<(skia_src_path)/core/SkImageFilterCache.h',
         '<(skia_src_path)/core/SkImageInfo.cpp',
         '<(skia_src_path)/core/SkImageCacherator.h',
         '<(skia_src_path)/core/SkImageCacherator.cpp',
         '<(skia_src_path)/core/SkImageGenerator.cpp',
         '<(skia_src_path)/core/SkImageGeneratorPriv.h',
         '<(skia_src_path)/core/SkLayerInfo.h',
         '<(skia_src_path)/core/SkLightingShader.h',
         '<(skia_src_path)/core/SkLightingShader.cpp',
+        '<(skia_src_path)/core/SkLightingShader_NormalSource.cpp',
         '<(skia_src_path)/core/SkLinearBitmapPipeline.cpp',
         '<(skia_src_path)/core/SkLinearBitmapPipeline.h',
         '<(skia_src_path)/core/SkLinearBitmapPipeline_core.h',
         '<(skia_src_path)/core/SkLinearBitmapPipeline_matrix.h',
         '<(skia_src_path)/core/SkLinearBitmapPipeline_tile.h',
         '<(skia_src_path)/core/SkLinearBitmapPipeline_sample.h',
         '<(skia_src_path)/core/SkLineClipper.cpp',
         '<(skia_src_path)/core/SkLocalMatrixImageFilter.cpp',
         '<(skia_src_path)/core/SkLocalMatrixImageFilter.h',
         '<(skia_src_path)/core/SkLocalMatrixShader.cpp',
@@ skipping 15 matching lines @@
         '<(skia_src_path)/core/SkMessageBus.h',
         '<(skia_src_path)/core/SkMetaData.cpp',
         '<(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',
@@ skipping 291 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',
     ],
 }