Revert "Relocate shaders to own dir"

This reverts commit fabe0b26d0.

Reason for revert: Last android roll failed with "external/skia/src/effects/SkGaussianEdgeShader.h:11:10: fatal error: 'SkShaderBase.h' file not found"

Original change's description:
> Relocate shaders to own dir
> 
> Consolidate all shader impls under src/shaders/.
> 
> Change-Id: I450e37541214704c1ad9e379d9d753b7cc62fac3
> Reviewed-on: https://skia-review.googlesource.com/17927
> Commit-Queue: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Herb Derby <herb@google.com>
> 

TBR=mtklein@google.com,herb@google.com,fmalita@chromium.org,reed@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true

Change-Id: Idbb2b75053969df1dad9d8ce0217cd39189b9ddb
Reviewed-on: https://skia-review.googlesource.com/18020
Reviewed-by: Stan Iliev <stani@google.com>
Commit-Queue: Stan Iliev <stani@google.com>

BUILD.gn

@@ -122,6 +122,7 @@ config("skia_private") {
     "src/codec",
     "src/core",
     "src/effects",
+    "src/effects/gradients",
     "src/fonts",
     "src/image",
     "src/images",
@@ -131,8 +132,6 @@ config("skia_private") {
     "src/pdf",
     "src/ports",
     "src/sfnt",
-    "src/shaders",
-    "src/shaders/gradients",
     "src/sksl",
     "src/utils",
     "src/utils/win",

gn/core.gni

@@ -34,6 +34,8 @@ skia_core_sources = [
   "$_src/core/SkThreadedBMPDevice.cpp",
   "$_src/core/SkThreadedBMPDevice.h",
   "$_src/core/SkBitmapFilter.h",
+  "$_src/core/SkBitmapProcShader.cpp",
+  "$_src/core/SkBitmapProcShader.h",
   "$_src/core/SkBitmapProcState.cpp",
   "$_src/core/SkBitmapProcState.h",
   "$_src/core/SkBitmapProcState_filter.h",
@@ -71,10 +73,13 @@ skia_core_sources = [
   "$_src/core/SkClipStackDevice.h",
   "$_src/core/SkColor.cpp",
   "$_src/core/SkColorFilter.cpp",
+  "$_src/core/SkColorFilterShader.cpp",
   "$_src/core/SkColorLookUpTable.cpp",
   "$_src/core/SkColorLookUpTable.h",
   "$_src/core/SkColorMatrixFilterRowMajor255.cpp",
   "$_src/core/SkColorMatrixFilterRowMajor255.h",
+  "$_src/core/SkColorShader.cpp",
+  "$_src/core/SkColorShader.h",
   "$_src/core/SkColorSpace.cpp",
   "$_src/core/SkColorSpace_A2B.cpp",
   "$_src/core/SkColorSpace_A2B.h",
@@ -88,6 +93,7 @@ skia_core_sources = [
   "$_src/core/SkColorSpaceXform_A2B.cpp",
   "$_src/core/SkColorSpaceXform_A2B.h",
   "$_src/core/SkColorTable.cpp",
+  "$_src/core/SkComposeShader.cpp",
   "$_src/core/SkConvertPixels.cpp",
   "$_src/core/SkConvertPixels.h",
   "$_src/core/SkConvolver.cpp",
@@ -123,6 +129,7 @@ skia_core_sources = [
   "$_src/core/SkEdgeBuilder.h",
   "$_src/core/SkEdgeClipper.cpp",
   "$_src/core/SkEdgeClipper.h",
+  "$_src/core/SkEmptyShader.h",
   "$_src/core/SkEndian.h",
   "$_src/core/SkExecutor.cpp",
   "$_src/core/SkAnalyticEdge.cpp",
@@ -165,6 +172,8 @@ skia_core_sources = [
   "$_src/core/SkImageInfo.cpp",
   "$_src/core/SkImageCacherator.h",
   "$_src/core/SkImageGenerator.cpp",
+  "$_src/core/SkLightingShader.h",
+  "$_src/core/SkLightingShader.cpp",
   "$_src/core/SkLights.cpp",
   "$_src/core/SkLinearBitmapPipeline.cpp",
   "$_src/core/SkLinearBitmapPipeline.h",
@@ -177,6 +186,7 @@ skia_core_sources = [
   "$_src/core/SkLiteRecorder.cpp",
   "$_src/core/SkLocalMatrixImageFilter.cpp",
   "$_src/core/SkLocalMatrixImageFilter.h",
+  "$_src/core/SkLocalMatrixShader.cpp",
   "$_src/core/SkMD5.cpp",
   "$_src/core/SkMD5.h",
   "$_src/core/SkMallocPixelRef.cpp",
@@ -243,6 +253,8 @@ skia_core_sources = [
   "$_src/core/SkPictureRecord.cpp",
   "$_src/core/SkPictureRecord.h",
   "$_src/core/SkPictureRecorder.cpp",
+  "$_src/core/SkPictureShader.cpp",
+  "$_src/core/SkPictureShader.h",
   "$_src/core/SkPixelRef.cpp",
   "$_src/core/SkPixmap.cpp",
   "$_src/core/SkPoint.cpp",
@@ -288,6 +300,8 @@ skia_core_sources = [
   "$_src/core/SkScan_Hairline.cpp",
   "$_src/core/SkScan_Path.cpp",
   "$_src/core/SkSemaphore.cpp",
+  "$_src/core/SkShader.cpp",
+  "$_src/core/SkShaderBase.h",
   "$_src/core/SkSharedMutex.cpp",
   "$_src/core/SkSharedMutex.h",
   "$_src/core/SkSinglyLinkedList.h",
@@ -362,6 +376,8 @@ skia_core_sources = [
   #        "$_src/image/SkImage_Gpu.cpp",
   "$_src/image/SkImage_Lazy.cpp",
   "$_src/image/SkImage_Raster.cpp",
+  "$_src/image/SkImageShader.cpp",
+  "$_src/image/SkImageShader.h",
   "$_src/image/SkSurface.cpp",
   "$_src/image/SkSurface_Base.h",
 
@@ -371,26 +387,6 @@ skia_core_sources = [
   "$_src/pipe/SkPipeCanvas.cpp",
   "$_src/pipe/SkPipeReader.cpp",
 
-  "$_src/shaders/SkBitmapProcShader.cpp",
-  "$_src/shaders/SkBitmapProcShader.h",
-  "$_src/shaders/SkColorFilterShader.cpp",
-  "$_src/shaders/SkColorFilterShader.h",
-  "$_src/shaders/SkColorShader.cpp",
-  "$_src/shaders/SkColorShader.h",
-  "$_src/shaders/SkComposeShader.cpp",
-  "$_src/shaders/SkComposeShader.h",
-  "$_src/shaders/SkEmptyShader.h",
-  "$_src/shaders/SkImageShader.cpp",
-  "$_src/shaders/SkImageShader.h",
-  "$_src/shaders/SkLightingShader.cpp",
-  "$_src/shaders/SkLightingShader.h",
-  "$_src/shaders/SkLocalMatrixShader.cpp",
-  "$_src/shaders/SkLocalMatrixShader.h",
-  "$_src/shaders/SkPictureShader.cpp",
-  "$_src/shaders/SkPictureShader.h",
-  "$_src/shaders/SkShader.cpp",
-  "$_src/shaders/SkShaderBase.h",
-
   "$_include/core/SkBBHFactory.h",
   "$_include/core/SkBitmap.h",
   "$_include/core/SkCanvas.h",

gn/effects.gni

@@ -56,6 +56,7 @@ skia_effects_sources = [
   "$_src/effects/SkPackBits.h",
   "$_src/effects/SkPaintFlagsDrawFilter.cpp",
   "$_src/effects/SkPaintImageFilter.cpp",
+  "$_src/effects/SkPerlinNoiseShader.cpp",
   "$_src/effects/SkPictureImageFilter.cpp",
   "$_src/effects/SkRRectsGaussianEdgeMaskFilter.cpp",
   "$_src/effects/SkTableColorFilter.cpp",
@@ -63,28 +64,27 @@ skia_effects_sources = [
   "$_src/effects/SkTileImageFilter.cpp",
   "$_src/effects/SkXfermodeImageFilter.cpp",
 
-  "$_src/shaders/SkPerlinNoiseShader.cpp",
-  "$_src/shaders/gradients/Sk4fGradientBase.cpp",
-  "$_src/shaders/gradients/Sk4fGradientBase.h",
-  "$_src/shaders/gradients/Sk4fGradientPriv.h",
-  "$_src/shaders/gradients/Sk4fLinearGradient.cpp",
-  "$_src/shaders/gradients/Sk4fLinearGradient.h",
-  "$_src/shaders/gradients/SkClampRange.cpp",
-  "$_src/shaders/gradients/SkClampRange.h",
-  "$_src/shaders/gradients/SkGradientBitmapCache.cpp",
-  "$_src/shaders/gradients/SkGradientBitmapCache.h",
-  "$_src/shaders/gradients/SkGradientShader.cpp",
-  "$_src/shaders/gradients/SkGradientShaderPriv.h",
-  "$_src/shaders/gradients/SkLinearGradient.cpp",
-  "$_src/shaders/gradients/SkLinearGradient.h",
-  "$_src/shaders/gradients/SkRadialGradient.cpp",
-  "$_src/shaders/gradients/SkRadialGradient.h",
-  "$_src/shaders/gradients/SkTwoPointConicalGradient.cpp",
-  "$_src/shaders/gradients/SkTwoPointConicalGradient.h",
-  "$_src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp",
-  "$_src/shaders/gradients/SkTwoPointConicalGradient_gpu.h",
-  "$_src/shaders/gradients/SkSweepGradient.cpp",
-  "$_src/shaders/gradients/SkSweepGradient.h",
+  "$_src/effects/gradients/Sk4fGradientBase.cpp",
+  "$_src/effects/gradients/Sk4fGradientBase.h",
+  "$_src/effects/gradients/Sk4fGradientPriv.h",
+  "$_src/effects/gradients/Sk4fLinearGradient.cpp",
+  "$_src/effects/gradients/Sk4fLinearGradient.h",
+  "$_src/effects/gradients/SkClampRange.cpp",
+  "$_src/effects/gradients/SkClampRange.h",
+  "$_src/effects/gradients/SkGradientBitmapCache.cpp",
+  "$_src/effects/gradients/SkGradientBitmapCache.h",
+  "$_src/effects/gradients/SkGradientShader.cpp",
+  "$_src/effects/gradients/SkGradientShaderPriv.h",
+  "$_src/effects/gradients/SkLinearGradient.cpp",
+  "$_src/effects/gradients/SkLinearGradient.h",
+  "$_src/effects/gradients/SkRadialGradient.cpp",
+  "$_src/effects/gradients/SkRadialGradient.h",
+  "$_src/effects/gradients/SkTwoPointConicalGradient.cpp",
+  "$_src/effects/gradients/SkTwoPointConicalGradient.h",
+  "$_src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp",
+  "$_src/effects/gradients/SkTwoPointConicalGradient_gpu.h",
+  "$_src/effects/gradients/SkSweepGradient.cpp",
+  "$_src/effects/gradients/SkSweepGradient.h",
 
   "$_include/effects/Sk1DPathEffect.h",
   "$_include/effects/Sk2DPathEffect.h",

public.bzl

@@ -442,7 +442,6 @@ INCLUDES = [
     "src/ports",
     "src/pdf",
     "src/sfnt",
-    "src/shaders",
     "src/sksl",
     "src/utils",
     "third_party/etc1",
@@ -545,13 +544,12 @@ DM_INCLUDES = [
     "src/codec",
     "src/core",
     "src/effects",
+    "src/effects/gradients",
     "src/fonts",
     "src/images",
     "src/pathops",
     "src/pipe/utils",
     "src/ports",
-    "src/shaders",
-    "src/shaders/gradients",
     "src/xml",
     "tests",
     "tools",