diff options
| author |  mtklein <mtklein@google.com> | 2016-08-22 09:25:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-22 09:25:59 -0700 |
| commit | 2ec417257b5866b653af1af6ef5e91388cc40f49 (patch) | |
| tree | 7ff302356a952647fc0f015dd5ce2f236f42efc2 /gyp | |
| parent | 78559a78f9d3e6444f8c0c9443696699703d6531 (diff) | |
Revert of Moving SkBlurImageFilter into core (patchset #6 id:100001 of https://codereview.chromium.org/2255803003/ )
Reason for revert:
It looks like this breaks our roll into Google3:
https://test.corp.google.com/ui#id=OCL:130943857:BASE:130944046:1471881622765:61dbdd3
Original issue's description:
> Moving SkBlurImageFilter into core
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2255803003
>
> Committed: https://skia.googlesource.com/skia/+/dd3259eb95c3b47e11eefa3b176365a112a32b48
TBR=reed@google.com,fmalita@chromium.org,vjiaoblack@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2263283002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 3 | ||||
| -rw-r--r-- | gyp/effects.gypi | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index 0a30618da3..8d1dc8d177 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -60,7 +60,6 @@ '<(skia_src_path)/core/SkBlitter_PM4f.cpp', '<(skia_src_path)/core/SkBlitter_RGB16.cpp', '<(skia_src_path)/core/SkBlitter_Sprite.cpp', - '<(skia_src_path)/core/SkBlurImageFilter.cpp', '<(skia_src_path)/core/SkBuffer.cpp', '<(skia_src_path)/core/SkCachedData.cpp', '<(skia_src_path)/core/SkCanvas.cpp', @@ -140,8 +139,6 @@ '<(skia_src_path)/core/SkGlyphCache.cpp', '<(skia_src_path)/core/SkGlyphCache.h', '<(skia_src_path)/core/SkGlyphCache_Globals.h', - '<(skia_src_path)/core/SkGpuBlurUtils.h', - '<(skia_src_path)/core/SkGpuBlurUtils.cpp', '<(skia_src_path)/core/SkGraphics.cpp', '<(skia_src_path)/core/SkHalf.cpp', '<(skia_src_path)/core/SkHalf.h', diff --git a/gyp/effects.gypi b/gyp/effects.gypi index 62c6bfdec4..45eced88e2 100644 --- a/gyp/effects.gypi +++ b/gyp/effects.gypi @@ -26,6 +26,7 @@ '<(skia_src_path)/effects/SkBlurDrawLooper.cpp', '<(skia_src_path)/effects/SkBlurMask.cpp', '<(skia_src_path)/effects/SkBlurMask.h', + '<(skia_src_path)/effects/SkBlurImageFilter.cpp', '<(skia_src_path)/effects/SkBlurMaskFilter.cpp', '<(skia_src_path)/effects/SkColorCubeFilter.cpp', '<(skia_src_path)/effects/SkColorFilterImageFilter.cpp', @@ -44,6 +45,8 @@ '<(skia_src_path)/effects/SkImageSource.cpp', '<(skia_src_path)/effects/SkGammaColorFilter.cpp', '<(skia_src_path)/effects/SkGaussianEdgeShader.cpp', + '<(skia_src_path)/effects/SkGpuBlurUtils.h', + '<(skia_src_path)/effects/SkGpuBlurUtils.cpp', '<(skia_src_path)/effects/SkLayerDrawLooper.cpp', '<(skia_src_path)/effects/SkLayerRasterizer.cpp', '<(skia_src_path)/effects/SkLightingImageFilter.cpp', |