Merge changes I2440a161,I3e478b11 into sc-dev am: ce6d9b4261

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16051823

Change-Id: I0105b95507f3c5384559186e3bbda463ac0b1b59
This commit is contained in:
Nader Jawad
2021-10-15 18:56:39 +00:00
committed by Automerger Merge Worker

View File

@@ -243,13 +243,12 @@ void RenderNodeDrawable::drawContent(SkCanvas* canvas) const {
// the corresponding SkImageFilter each time.
// See b/193145089 and b/197263715
if (!Properties::enableRenderEffectCache) {
snapshotImage = renderNode->getLayerSurface()->makeImageSnapshot();
if (imageFilter) {
auto subset = SkIRect::MakeWH(srcBounds.width(), srcBounds.height());
snapshotImage = snapshotImage->makeWithFilter(recordingContext, imageFilter,
subset, clipBounds.roundOut(),
&srcBounds, &offset);
} else {
snapshotImage = renderNode->getLayerSurface()->makeImageSnapshot();
}
} else {
const auto snapshotResult = renderNode->updateSnapshotIfRequired(