diff options
author | Florin Malita <fmalita@chromium.org> | 2017-05-25 15:29:13 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-25 20:05:08 +0000 |
commit | fabe0b26d05624ce7374f6ca89bd66df6142534e (patch) | |
tree | f32b5873b31185d7e86e6c48fbdbd654efb8af7a | |
parent | 1c214313248a4b5a69af14539608c54fb67c2bf8 (diff) |
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>
-rw-r--r-- | BUILD.gn | 3 | ||||
-rw-r--r-- | gn/core.gni | 36 | ||||
-rw-r--r-- | gn/effects.gni | 44 | ||||
-rw-r--r-- | public.bzl | 4 | ||||
-rw-r--r-- | src/shaders/SkBitmapProcShader.cpp (renamed from src/core/SkBitmapProcShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkBitmapProcShader.h (renamed from src/core/SkBitmapProcShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkColorFilterShader.cpp (renamed from src/core/SkColorFilterShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkColorFilterShader.h (renamed from src/core/SkColorFilterShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkColorShader.cpp (renamed from src/core/SkColorShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkColorShader.h (renamed from src/core/SkColorShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkComposeShader.cpp (renamed from src/core/SkComposeShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkComposeShader.h (renamed from src/core/SkComposeShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkEmptyShader.h (renamed from src/core/SkEmptyShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkImageShader.cpp (renamed from src/image/SkImageShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkImageShader.h (renamed from src/image/SkImageShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkLightingShader.cpp (renamed from src/core/SkLightingShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkLightingShader.h (renamed from src/core/SkLightingShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkLocalMatrixShader.cpp (renamed from src/core/SkLocalMatrixShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkLocalMatrixShader.h (renamed from src/core/SkLocalMatrixShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkPerlinNoiseShader.cpp (renamed from src/effects/SkPerlinNoiseShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkPictureShader.cpp (renamed from src/core/SkPictureShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkPictureShader.h (renamed from src/core/SkPictureShader.h) | 0 | ||||
-rw-r--r-- | src/shaders/SkShader.cpp (renamed from src/core/SkShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/SkShaderBase.h (renamed from src/core/SkShaderBase.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/Sk4fGradientBase.cpp (renamed from src/effects/gradients/Sk4fGradientBase.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/Sk4fGradientBase.h (renamed from src/effects/gradients/Sk4fGradientBase.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/Sk4fGradientPriv.h (renamed from src/effects/gradients/Sk4fGradientPriv.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/Sk4fLinearGradient.cpp (renamed from src/effects/gradients/Sk4fLinearGradient.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/Sk4fLinearGradient.h (renamed from src/effects/gradients/Sk4fLinearGradient.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkClampRange.cpp (renamed from src/effects/gradients/SkClampRange.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkClampRange.h (renamed from src/effects/gradients/SkClampRange.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkGradientBitmapCache.cpp (renamed from src/effects/gradients/SkGradientBitmapCache.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkGradientBitmapCache.h (renamed from src/effects/gradients/SkGradientBitmapCache.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkGradientShader.cpp (renamed from src/effects/gradients/SkGradientShader.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkGradientShaderPriv.h (renamed from src/effects/gradients/SkGradientShaderPriv.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkLinearGradient.cpp (renamed from src/effects/gradients/SkLinearGradient.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkLinearGradient.h (renamed from src/effects/gradients/SkLinearGradient.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkRadialGradient.cpp (renamed from src/effects/gradients/SkRadialGradient.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkRadialGradient.h (renamed from src/effects/gradients/SkRadialGradient.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkSweepGradient.cpp (renamed from src/effects/gradients/SkSweepGradient.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkSweepGradient.h (renamed from src/effects/gradients/SkSweepGradient.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkTwoPointConicalGradient.cpp (renamed from src/effects/gradients/SkTwoPointConicalGradient.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkTwoPointConicalGradient.h (renamed from src/effects/gradients/SkTwoPointConicalGradient.h) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp (renamed from src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp) | 0 | ||||
-rw-r--r-- | src/shaders/gradients/SkTwoPointConicalGradient_gpu.h (renamed from src/effects/gradients/SkTwoPointConicalGradient_gpu.h) | 0 |
45 files changed, 47 insertions, 40 deletions
@@ -122,7 +122,6 @@ config("skia_private") { "src/codec", "src/core", "src/effects", - "src/effects/gradients", "src/fonts", "src/image", "src/images", @@ -132,6 +131,8 @@ config("skia_private") { "src/pdf", "src/ports", "src/sfnt", + "src/shaders", + "src/shaders/gradients", "src/sksl", "src/utils", "src/utils/win", diff --git a/gn/core.gni b/gn/core.gni index 9dfc47826b..95d2b00d2e 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -34,8 +34,6 @@ 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", @@ -74,13 +72,10 @@ 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", @@ -94,7 +89,6 @@ 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", @@ -130,7 +124,6 @@ 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", @@ -173,8 +166,6 @@ 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", @@ -187,7 +178,6 @@ 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", @@ -254,8 +244,6 @@ 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", @@ -301,8 +289,6 @@ 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", @@ -377,8 +363,6 @@ 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", @@ -388,6 +372,26 @@ 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", diff --git a/gn/effects.gni b/gn/effects.gni index 278925ba85..3fd8e531a6 100644 --- a/gn/effects.gni +++ b/gn/effects.gni @@ -56,7 +56,6 @@ 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", @@ -64,27 +63,28 @@ skia_effects_sources = [ "$_src/effects/SkTileImageFilter.cpp", "$_src/effects/SkXfermodeImageFilter.cpp", - "$_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", + "$_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", "$_include/effects/Sk1DPathEffect.h", "$_include/effects/Sk2DPathEffect.h", diff --git a/public.bzl b/public.bzl index ba3b3b0953..722c126cd7 100644 --- a/public.bzl +++ b/public.bzl @@ -442,6 +442,7 @@ INCLUDES = [ "src/ports", "src/pdf", "src/sfnt", + "src/shaders", "src/sksl", "src/utils", "third_party/etc1", @@ -544,12 +545,13 @@ 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", diff --git a/src/core/SkBitmapProcShader.cpp b/src/shaders/SkBitmapProcShader.cpp index e52982354d..e52982354d 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/shaders/SkBitmapProcShader.cpp diff --git a/src/core/SkBitmapProcShader.h b/src/shaders/SkBitmapProcShader.h index 2a2599cb1d..2a2599cb1d 100644 --- a/src/core/SkBitmapProcShader.h +++ b/src/shaders/SkBitmapProcShader.h diff --git a/src/core/SkColorFilterShader.cpp b/src/shaders/SkColorFilterShader.cpp index 4798422dfa..4798422dfa 100644 --- a/src/core/SkColorFilterShader.cpp +++ b/src/shaders/SkColorFilterShader.cpp diff --git a/src/core/SkColorFilterShader.h b/src/shaders/SkColorFilterShader.h index 7f4202158a..7f4202158a 100644 --- a/src/core/SkColorFilterShader.h +++ b/src/shaders/SkColorFilterShader.h diff --git a/src/core/SkColorShader.cpp b/src/shaders/SkColorShader.cpp index 32b2c54d71..32b2c54d71 100644 --- a/src/core/SkColorShader.cpp +++ b/src/shaders/SkColorShader.cpp diff --git a/src/core/SkColorShader.h b/src/shaders/SkColorShader.h index 9af83c1163..9af83c1163 100644 --- a/src/core/SkColorShader.h +++ b/src/shaders/SkColorShader.h diff --git a/src/core/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp index 7735494291..7735494291 100644 --- a/src/core/SkComposeShader.cpp +++ b/src/shaders/SkComposeShader.cpp diff --git a/src/core/SkComposeShader.h b/src/shaders/SkComposeShader.h index 8592f3a8ae..8592f3a8ae 100644 --- a/src/core/SkComposeShader.h +++ b/src/shaders/SkComposeShader.h diff --git a/src/core/SkEmptyShader.h b/src/shaders/SkEmptyShader.h index c1bcfe0957..c1bcfe0957 100644 --- a/src/core/SkEmptyShader.h +++ b/src/shaders/SkEmptyShader.h diff --git a/src/image/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index 751300e951..751300e951 100644 --- a/src/image/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp diff --git a/src/image/SkImageShader.h b/src/shaders/SkImageShader.h index 7be982c5c6..7be982c5c6 100644 --- a/src/image/SkImageShader.h +++ b/src/shaders/SkImageShader.h diff --git a/src/core/SkLightingShader.cpp b/src/shaders/SkLightingShader.cpp index cdfa528e1e..cdfa528e1e 100644 --- a/src/core/SkLightingShader.cpp +++ b/src/shaders/SkLightingShader.cpp diff --git a/src/core/SkLightingShader.h b/src/shaders/SkLightingShader.h index aa90710aa4..aa90710aa4 100644 --- a/src/core/SkLightingShader.h +++ b/src/shaders/SkLightingShader.h diff --git a/src/core/SkLocalMatrixShader.cpp b/src/shaders/SkLocalMatrixShader.cpp index e21e4a84b7..e21e4a84b7 100644 --- a/src/core/SkLocalMatrixShader.cpp +++ b/src/shaders/SkLocalMatrixShader.cpp diff --git a/src/core/SkLocalMatrixShader.h b/src/shaders/SkLocalMatrixShader.h index 4572e9fe2e..4572e9fe2e 100644 --- a/src/core/SkLocalMatrixShader.h +++ b/src/shaders/SkLocalMatrixShader.h diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp index 87f8967242..87f8967242 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/shaders/SkPerlinNoiseShader.cpp diff --git a/src/core/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp index d6ee941251..d6ee941251 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/shaders/SkPictureShader.cpp diff --git a/src/core/SkPictureShader.h b/src/shaders/SkPictureShader.h index f7a509f181..f7a509f181 100644 --- a/src/core/SkPictureShader.h +++ b/src/shaders/SkPictureShader.h diff --git a/src/core/SkShader.cpp b/src/shaders/SkShader.cpp index d04fbfe4df..d04fbfe4df 100644 --- a/src/core/SkShader.cpp +++ b/src/shaders/SkShader.cpp diff --git a/src/core/SkShaderBase.h b/src/shaders/SkShaderBase.h index 895fc6cf05..895fc6cf05 100644 --- a/src/core/SkShaderBase.h +++ b/src/shaders/SkShaderBase.h diff --git a/src/effects/gradients/Sk4fGradientBase.cpp b/src/shaders/gradients/Sk4fGradientBase.cpp index e20f5f4702..e20f5f4702 100644 --- a/src/effects/gradients/Sk4fGradientBase.cpp +++ b/src/shaders/gradients/Sk4fGradientBase.cpp diff --git a/src/effects/gradients/Sk4fGradientBase.h b/src/shaders/gradients/Sk4fGradientBase.h index a660d6bde5..a660d6bde5 100644 --- a/src/effects/gradients/Sk4fGradientBase.h +++ b/src/shaders/gradients/Sk4fGradientBase.h diff --git a/src/effects/gradients/Sk4fGradientPriv.h b/src/shaders/gradients/Sk4fGradientPriv.h index b8f4bcaee1..b8f4bcaee1 100644 --- a/src/effects/gradients/Sk4fGradientPriv.h +++ b/src/shaders/gradients/Sk4fGradientPriv.h diff --git a/src/effects/gradients/Sk4fLinearGradient.cpp b/src/shaders/gradients/Sk4fLinearGradient.cpp index 49b98fd86e..49b98fd86e 100644 --- a/src/effects/gradients/Sk4fLinearGradient.cpp +++ b/src/shaders/gradients/Sk4fLinearGradient.cpp diff --git a/src/effects/gradients/Sk4fLinearGradient.h b/src/shaders/gradients/Sk4fLinearGradient.h index eebd30fbf5..eebd30fbf5 100644 --- a/src/effects/gradients/Sk4fLinearGradient.h +++ b/src/shaders/gradients/Sk4fLinearGradient.h diff --git a/src/effects/gradients/SkClampRange.cpp b/src/shaders/gradients/SkClampRange.cpp index efc93959d1..efc93959d1 100644 --- a/src/effects/gradients/SkClampRange.cpp +++ b/src/shaders/gradients/SkClampRange.cpp diff --git a/src/effects/gradients/SkClampRange.h b/src/shaders/gradients/SkClampRange.h index 8a22e72d38..8a22e72d38 100644 --- a/src/effects/gradients/SkClampRange.h +++ b/src/shaders/gradients/SkClampRange.h diff --git a/src/effects/gradients/SkGradientBitmapCache.cpp b/src/shaders/gradients/SkGradientBitmapCache.cpp index 06b2d8c3fe..06b2d8c3fe 100644 --- a/src/effects/gradients/SkGradientBitmapCache.cpp +++ b/src/shaders/gradients/SkGradientBitmapCache.cpp diff --git a/src/effects/gradients/SkGradientBitmapCache.h b/src/shaders/gradients/SkGradientBitmapCache.h index 0dcd32272e..0dcd32272e 100644 --- a/src/effects/gradients/SkGradientBitmapCache.h +++ b/src/shaders/gradients/SkGradientBitmapCache.h diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp index 137da84d0c..137da84d0c 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/shaders/gradients/SkGradientShader.cpp diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/shaders/gradients/SkGradientShaderPriv.h index 7a66edaffc..7a66edaffc 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/shaders/gradients/SkGradientShaderPriv.h diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp index 17c4fd36a4..17c4fd36a4 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/shaders/gradients/SkLinearGradient.cpp diff --git a/src/effects/gradients/SkLinearGradient.h b/src/shaders/gradients/SkLinearGradient.h index 19a965c7bb..19a965c7bb 100644 --- a/src/effects/gradients/SkLinearGradient.h +++ b/src/shaders/gradients/SkLinearGradient.h diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/shaders/gradients/SkRadialGradient.cpp index d49b3dd8e1..d49b3dd8e1 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/shaders/gradients/SkRadialGradient.cpp diff --git a/src/effects/gradients/SkRadialGradient.h b/src/shaders/gradients/SkRadialGradient.h index 69ec4b1285..69ec4b1285 100644 --- a/src/effects/gradients/SkRadialGradient.h +++ b/src/shaders/gradients/SkRadialGradient.h diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp index a138a8e213..a138a8e213 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/shaders/gradients/SkSweepGradient.cpp diff --git a/src/effects/gradients/SkSweepGradient.h b/src/shaders/gradients/SkSweepGradient.h index c30ca4d916..c30ca4d916 100644 --- a/src/effects/gradients/SkSweepGradient.h +++ b/src/shaders/gradients/SkSweepGradient.h diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/shaders/gradients/SkTwoPointConicalGradient.cpp index 4549527d51..4549527d51 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/shaders/gradients/SkTwoPointConicalGradient.cpp diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/shaders/gradients/SkTwoPointConicalGradient.h index b32f52c1e0..b32f52c1e0 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.h +++ b/src/shaders/gradients/SkTwoPointConicalGradient.h diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp index 8402199362..8402199362 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.h b/src/shaders/gradients/SkTwoPointConicalGradient_gpu.h index 46edb1f7d1..46edb1f7d1 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.h +++ b/src/shaders/gradients/SkTwoPointConicalGradient_gpu.h |