From da20330b3503d2b18eaa33bb49f28fb1b8140f2e Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 15 Jan 2021 14:27:02 -0500 Subject: Fix nine-patches to always filter Regression was introduced here: https://android.git.corp.google.com/platform/frameworks/base/+/c2dbc03acc61e3d4303afbbc63c8e7144f617846 Bug: 176691890 Test: I1336d7e70f0e46e57023d7e0b8331ba7cba137ac Change-Id: I8153f1d6ecd850953369dd664da88915c3842bb5 (cherry picked from commit 0e540d057c4c57cef5c469e3e94c0eda551b4f46) Merged-In: I8153f1d6ecd850953369dd664da88915c3842bb5 Merged-In: I16f5aaff99ad6d2b6813a75ddbb4c97beb7aa2d8 --- libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs') diff --git a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp index d67cf8c9c73f..5ff8fbc05e95 100644 --- a/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp +++ b/libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp @@ -301,7 +301,8 @@ void SkiaRecordingCanvas::drawNinePatch(Bitmap& bitmap, const Res_png_9patch& ch } sk_sp image = bitmap.makeImage(); - applyLooper(get_looper(paint), *filterBitmap(paint), [&](SkScalar x, SkScalar y, const SkPaint& p) { + applyLooper(get_looper(paint), *filterBitmap(*filteredPaint), [&](SkScalar x, SkScalar y, + const SkPaint& p) { mRecorder.drawImageLattice(image, lattice, dst.makeOffset(x, y), &p, bitmap.palette()); }); -- cgit v1.2.3-59-g8ed1b