hide emboss from everyone (except android for now)

BUG=skia:

Change-Id: Ibd453b0a63948e3e4950f02459d7bc01a6ed26c5
Reviewed-on: https://skia-review.googlesource.com/5671
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>

9 files changed, 11 insertions, 4 deletions

diff --git a/gm/emboss.cpp b/gm/emboss.cpp
index c4c620961c..c14c9d9278 100644
--- a/gm/emboss.cpp
+++ b/gm/emboss.cpp
@@ -10,7 +10,7 @@
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
 
-#include "SkColorFilter.h"
+#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER
 static SkBitmap make_bm() {
     SkBitmap bm;
     bm.allocN32Pixels(100, 100);
@@ -59,3 +59,4 @@ private:
 };
 
 DEF_GM(return new EmbossGM;)
+#endif
diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni
index a80e38d09e..3c398dc061 100644
--- a/gn/android_framework_defines.gni
+++ b/gn/android_framework_defines.gni
@@ -16,4 +16,5 @@ android_framework_defines = [
   "SK_SUPPORT_LEGACY_CLIP_REGIONOPS",
   "SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS",
   "SK_SUPPORT_LEGACY_SHADER_ISABITMAP",
+  "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER",
 ]
diff --git a/gn/effects.gni b/gn/effects.gni
index 3bb84aceba..10a2576daa 100644
--- a/gn/effects.gni
+++ b/gn/effects.gni
@@ -103,7 +103,6 @@ skia_effects_sources = [
   "$_include/effects/SkDiscretePathEffect.h",
   "$_include/effects/SkDisplacementMapEffect.h",
   "$_include/effects/SkDropShadowImageFilter.h",
-  "$_include/effects/SkEmbossMaskFilter.h",
   "$_include/effects/SkGammaColorFilter.h",
   "$_include/effects/SkGaussianEdgeShader.h",
   "$_include/effects/SkGradientShader.h",
diff --git a/include/effects/SkBlurMaskFilter.h b/include/effects/SkBlurMaskFilter.h
index e32672ac67..4106b015ec 100644
--- a/include/effects/SkBlurMaskFilter.h
+++ b/include/effects/SkBlurMaskFilter.h
@@ -48,6 +48,7 @@ public:
         return Make(style, sigma, SkRect::MakeEmpty(), flags);
     }
 
+#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER
     /** Create an emboss maskfilter
         @param blurSigma    standard deviation of the Gaussian blur to apply
                             before applying lighting (e.g. 3)
@@ -58,6 +59,7 @@ public:
     */
     static sk_sp<SkMaskFilter> MakeEmboss(SkScalar blurSigma, const SkScalar direction[3],
                                           SkScalar ambient, SkScalar specular);
+#endif
 
     static const int kMaxDivisions = 6;
 
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index fc3a95ab88..a098eb6c16 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -247,7 +247,7 @@ static void apply_shader(SkPaint* paint, int index) {
         paint->setRasterizer(rastBuilder.detach());
     }
 
-#if 1
+#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER
     SkScalar dir[] = { SK_Scalar1, SK_Scalar1, SK_Scalar1 };
     paint->setMaskFilter(SkBlurMaskFilter::MakeEmboss(
                 SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), dir,
diff --git a/samplecode/SampleEffects.cpp b/samplecode/SampleEffects.cpp
index c998052fab..8c6793eb67 100644
--- a/samplecode/SampleEffects.cpp
+++ b/samplecode/SampleEffects.cpp
@@ -28,9 +28,11 @@ static void paint_proc1(SkPaint* paint) {
 }
 
 static void paint_proc2(SkPaint* paint) {
+#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER
     SkScalar dir[3] = { 1, 1, 1};
     paint->setMaskFilter(
             SkBlurMaskFilter::MakeEmboss(SkBlurMask::ConvertRadiusToSigma(1), dir, 0.1f, 0.05f));
+#endif
 }
 
 static void paint_proc3(SkPaint* paint) {
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
index 5f2e2fdfa9..4caef9ef0b 100644
--- a/src/effects/SkEmbossMaskFilter.cpp
+++ b/src/effects/SkEmbossMaskFilter.cpp
@@ -17,6 +17,7 @@ sk_sp<SkMaskFilter> SkEmbossMaskFilter::Make(SkScalar blurSigma, const Light& li
     return sk_sp<SkMaskFilter>(new SkEmbossMaskFilter(blurSigma, light));
 }
 
+#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER
 sk_sp<SkMaskFilter> SkBlurMaskFilter::MakeEmboss(SkScalar blurSigma, const SkScalar direction[3],
                                                  SkScalar ambient, SkScalar specular) {
     if (direction == nullptr) {
@@ -34,6 +35,7 @@ sk_sp<SkMaskFilter> SkBlurMaskFilter::MakeEmboss(SkScalar blurSigma, const SkSca
 
     return SkEmbossMaskFilter::Make(blurSigma, light);
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/effects/SkEmbossMaskFilter.h b/src/effects/SkEmbossMaskFilter.h
index 395657224c..395657224c 100644
--- a/include/effects/SkEmbossMaskFilter.h
+++ b/src/effects/SkEmbossMaskFilter.h
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 6b9dcacdef..0a4e8f6a36 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -23,7 +23,7 @@
 #include "SkDiscretePathEffect.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkDropShadowImageFilter.h"
-#include "SkEmbossMaskFilter.h"
+#include "../../src/effects/SkEmbossMaskFilter.h"
 #include "SkGaussianEdgeShader.h"
 #include "SkRRectsGaussianEdgeMaskFilter.h"
 #include "SkGradientShader.h"