From 960f400e0b39baa3b698d898623cb0c78fcd9301 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sun, 21 Mar 2021 02:37:48 +0000 Subject: [PATCH] Opt into new matrix-image-filter factory Change-Id: I583e4302730459c155ddbf170b08bc04d4e7fd43 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2776932 Auto-Submit: Mike Reed Commit-Queue: Florin Malita Reviewed-by: Florin Malita Cr-Commit-Position: refs/heads/master@{#864983} --- cc/paint/paint_filter.cc | 5 ++++- skia/config/SkUserConfig.h | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cc/paint/paint_filter.cc b/cc/paint/paint_filter.cc index d75a827e43f68a..3ad2d2f46dd1c3 100644 --- a/cc/paint/paint_filter.cc +++ b/cc/paint/paint_filter.cc @@ -1032,7 +1032,10 @@ MatrixPaintFilter::MatrixPaintFilter(const SkMatrix& matrix, filter_quality_(filter_quality), input_(std::move(input)) { cached_sk_filter_ = SkImageFilters::MatrixTransform( - matrix_, filter_quality_, GetSkFilter(input_.get())); + matrix_, + SkSamplingOptions(filter_quality_, + SkSamplingOptions::kMedium_asMipmapLinear), + GetSkFilter(input_.get())); } MatrixPaintFilter::~MatrixPaintFilter() = default; diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index f45890b07739da..83a41864e4d3dc 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -202,8 +202,6 @@ SK_API void SkDebugf_FileLine(const char* file, // (https://bugs.chromium.org/p/skia/issues/detail?id=4863) #define SK_SUPPORT_LEGACY_ANISOTROPIC_MIPMAP_SCALE -#define SK_SUPPORT_LEGACY_MATRIX_IMAGEFILTER - // For now, Chrome should only attempt to reduce opList splitting when recording // DDLs #define SK_DISABLE_REDUCE_OPLIST_SPLITTING