From 6b26deb8d6067589ce9b7853ab8e8d39de1a45de Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Fri, 10 Nov 2017 16:24:50 -0500 Subject: Alloc glyph image correctly for SkMask::k3D_Format. This removes the no longer used outside Skia SK_SUPPORT_LEGACY_EMBOSSMASKFILTER define, and either deletes the code it guards or updates it to use the new emboss mask filter factory. This re-enables the code to test the emboss mask filter. Also added is a test to ensure that embossed text is drawn correctly, as before this glyphs did not allocate the proper amount of memory for the k3D_Format which this mask filter produces. This also fixes SkEmbossMask::Emboss to write the whole of the mul and add planes to avoid pixel differences and MemorySanitizer errors. Change-Id: Ib492c72a19d6a27d140e3cd48179a3ca9ce313f5 Reviewed-on: https://skia-review.googlesource.com/70260 Commit-Queue: Ben Wagner Reviewed-by: Herb Derby --- include/effects/SkBlurMaskFilter.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'include/effects') diff --git a/include/effects/SkBlurMaskFilter.h b/include/effects/SkBlurMaskFilter.h index 8b032e50ee..e000732a85 100644 --- a/include/effects/SkBlurMaskFilter.h +++ b/include/effects/SkBlurMaskFilter.h @@ -48,19 +48,6 @@ 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) - @param direction array of 3 scalars [x, y, z] specifying the direction of the light source - @param ambient 0...1 amount of ambient light - @param specular coefficient for specular highlights (e.g. 8) - @return the emboss maskfilter - */ - static sk_sp MakeEmboss(SkScalar blurSigma, const SkScalar direction[3], - SkScalar ambient, SkScalar specular); -#endif - static const int kMaxDivisions = 6; // This method computes all the parameters for drawing a partially occluded nine-patched -- cgit v1.2.3