Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Simplify calling loopers"

Browse Source 
This reverts commit 07c0b7c0d1.

Reason for revert: http://b/180818875 systemui crashloops in libhwui

Change-Id: Id62860d43d7fac572bd94ebc4fe5cc1ff7cc6820
This commit is contained in:
Chris Fries
2021-02-21 03:49:09 +00:00
parent 07c0b7c0d1
commit 1edec35288
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
View File

@@ -194,6 +194,25 @@ SkiaCanvas::PaintCoW&& SkiaRecordingCanvas::filterBitmap(PaintCoW&& paint) {
return filterPaint(std::move(paint));
}
static BlurDrawLooper* get_looper(const Paint* paint) {
return paint ? paint->getLooper() : nullptr;
}
template <typename Proc>
void applyLooper(BlurDrawLooper* looper, const SkPaint* paint, Proc proc) {
if (looper) {
SkPaint p;
if (paint) {
p = *paint;
}
looper->apply(p, [&](SkPoint offset, const SkPaint& modifiedPaint) {
proc(offset.fX, offset.fY, &modifiedPaint);
});
} else {
proc(0, 0, paint);
}
}
static SkFilterMode Paint_to_filter(const SkPaint* paint) {
return paint && paint->getFilterQuality() != kNone_SkFilterQuality ? SkFilterMode::kLinear
: SkFilterMode::kNearest;
@@ -207,7 +226,8 @@ static SkSamplingOptions Paint_to_sampling(const SkPaint* paint) {
void SkiaRecordingCanvas::drawBitmap(Bitmap& bitmap, float left, float top, const Paint* paint) {
sk_sp<SkImage> image = bitmap.makeImage();
applyLooper(paint, [&](SkScalar x, SkScalar y, const SkPaint* p) {
applyLooper(get_looper(paint), filterBitmap(paint), [&](SkScalar x, SkScalar y,
const SkPaint* p) {
mRecorder.drawImage(image, left + x, top + y, Paint_to_sampling(p), p, bitmap.palette());
});
@@ -225,7 +245,8 @@ void SkiaRecordingCanvas::drawBitmap(Bitmap& bitmap, const SkMatrix& matrix, con
sk_sp<SkImage> image = bitmap.makeImage();
applyLooper(paint, [&](SkScalar x, SkScalar y, const SkPaint* p) {
applyLooper(get_looper(paint), filterBitmap(paint), [&](SkScalar x, SkScalar y,
const SkPaint* p) {
mRecorder.drawImage(image, x, y, Paint_to_sampling(p), p, bitmap.palette());
});
@@ -242,7 +263,8 @@ void SkiaRecordingCanvas::drawBitmap(Bitmap& bitmap, float srcLeft, float srcTop
sk_sp<SkImage> image = bitmap.makeImage();
applyLooper(paint, [&](SkScalar x, SkScalar y, const SkPaint* p) {
applyLooper(get_looper(paint), filterBitmap(paint), [&](SkScalar x, SkScalar y,
const SkPaint* p) {
mRecorder.drawImageRect(image, srcRect, dstRect.makeOffset(x, y), Paint_to_sampling(p),
p, SkCanvas::kFast_SrcRectConstraint, bitmap.palette());
});
@@ -281,7 +303,8 @@ void SkiaRecordingCanvas::drawNinePatch(Bitmap& bitmap, const Res_png_9patch& ch
// HWUI always draws 9-patches with linear filtering, regardless of the Paint.
const SkFilterMode filter = SkFilterMode::kLinear;
applyLooper(paint, [&](SkScalar x, SkScalar y, const SkPaint* p) {
applyLooper(get_looper(paint), filterBitmap(paint), [&](SkScalar x, SkScalar y,
const SkPaint* p) {
mRecorder.drawImageLattice(image, lattice, dst.makeOffset(x, y), filter, p,
bitmap.palette());
});

13
libs/hwui/pipeline/skia/SkiaRecordingCanvas.h
View File

@@ -87,19 +87,6 @@ private:
std::unique_ptr<SkiaDisplayList> mDisplayList;
StartReorderBarrierDrawable* mCurrentBarrier;
template <typename Proc>
void applyLooper(const Paint* paint, Proc proc) {
const SkPaint* sk_paint = filterBitmap(paint);
const BlurDrawLooper* looper = paint ? paint->getLooper() : nullptr;
if (looper) {
looper->apply(*sk_paint, [&](SkPoint offset, const SkPaint& modifiedPaint) {
proc(offset.fX, offset.fY, &modifiedPaint);
});
} else {
proc(0, 0, sk_paint);
}
}
/**
* A new SkiaDisplayList is created or recycled if available.
*