From 192b18a26164e8e188f8aad0a376c7bee2cea226 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Wed, 2 May 2018 13:53:14 +0000 Subject: Revert "fonts: Bandaid fix for desc mismatch in SkRemoteGlyphCache." This reverts commit ef4142a9bc5fb5fe3158139e18f41e7da867ff93. Reason for revert: 2 of 5 Original change's description: > fonts: Bandaid fix for desc mismatch in SkRemoteGlyphCache. > > Since the typeface proxies on the client don't perform the same > filtering done on the server during SkDescriptor generation, it causes > the desc mismatches during raster. Disable this filtering on the server > until this is resolved. > > Bug: 831354 > Change-Id: I5683372fb497a4874dede5aec9c734cd1392872c > Reviewed-on: https://skia-review.googlesource.com/125140 > Commit-Queue: Khusal Sagar > Reviewed-by: Herb Derby TBR=herb@google.com,khushalsagar@chromium.org Change-Id: I8e732f57aa49323c186e3c4ea6120ff1caf8e25b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 831354 Reviewed-on: https://skia-review.googlesource.com/125261 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- src/core/SkScalerContext.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/core/SkScalerContext.h') diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h index 556ec18c67..9995fd9292 100644 --- a/src/core/SkScalerContext.h +++ b/src/core/SkScalerContext.h @@ -310,8 +310,7 @@ public: const SkMatrix* deviceMatrix, SkScalerContextFlags scalerContextFlags, SkScalerContextRec* rec, - SkScalerContextEffects* effects, - bool enableTypefaceFiltering = true); + SkScalerContextEffects* effects); static SkDescriptor* MakeDescriptorForPaths(SkFontID fontID, SkAutoDescriptor* ad); -- cgit v1.2.3