Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit add5a888 authored by Nader Jawad's avatar Nader Jawad Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I1087958a733779d89f9e1656e02589373a893191
parents 7a45d4d3 ce6d9b42
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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(