diff options
| author | Nader Jawad <njawad@google.com> | 2021-09-28 18:40:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-28 18:40:58 +0000 |
| commit | 15d37532bfa7db75b9739a523b30d22a3f908cbd (patch) | |
| tree | a2b25ca1c42fb0909e62d218598b6265e7dacc6b /libs/hwui | |
| parent | 05b2d626e6e9ba50530442c345490b4aea2a806e (diff) | |
| parent | be0bdf6178e8084b928f8bd98ce3e0a1a53dd3d9 (diff) | |
Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060
Change-Id: I601044300fbea039823b2bfad37d59cc4fec6ed5
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp index 2c81c971f7a6..48145d2331ee 100644 --- a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp +++ b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp @@ -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( |