diff options
| author | Leon Scroggins <scroggo@google.com> | 2023-08-03 14:12:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-03 14:12:32 +0000 |
| commit | 3bf0bd7feb3c156c714f442001273a308341cc49 (patch) | |
| tree | 1d4b6a55aff6e7230211f9930ef21e41d9d7d7d6 | |
| parent | 6b7840b708400a658f9be9a631ba7ec72f673853 (diff) | |
| parent | 40fb4429b94d42e138ff0e40027abf0f328b1ec0 (diff) | |
| download | native-3bf0bd7feb3c156c714f442001273a308341cc49.tar.gz | |
Merge "RenderEngine: don't blur when using protected content" into udc-dev am: 40fb4429b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24212483
Change-Id: Ie01674ee82b01b0fc62f146455d43a86ea873f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/renderengine/skia/SkiaRenderEngine.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/renderengine/skia/SkiaRenderEngine.cpp b/libs/renderengine/skia/SkiaRenderEngine.cpp index 76ebf9d0c2..9e9df5216f 100644 --- a/libs/renderengine/skia/SkiaRenderEngine.cpp +++ b/libs/renderengine/skia/SkiaRenderEngine.cpp @@ -711,7 +711,9 @@ void SkiaRenderEngine::drawLayersInternal( SkCanvas* canvas = dstCanvas; SkiaCapture::OffscreenState offscreenCaptureState; const LayerSettings* blurCompositionLayer = nullptr; - if (mBlurFilter) { + + // TODO (b/270314344): Enable blurs in protected context. + if (mBlurFilter && !mInProtectedContext) { bool requiresCompositionLayer = false; for (const auto& layer : layers) { // if the layer doesn't have blur or it is not visible then continue @@ -805,7 +807,8 @@ void SkiaRenderEngine::drawLayersInternal( const auto [bounds, roundRectClip] = getBoundsAndClip(layer.geometry.boundaries, layer.geometry.roundedCornersCrop, layer.geometry.roundedCornersRadius); - if (mBlurFilter && layerHasBlur(layer, ctModifiesAlpha)) { + // TODO (b/270314344): Enable blurs in protected context. + if (mBlurFilter && layerHasBlur(layer, ctModifiesAlpha) && !mInProtectedContext) { std::unordered_map<uint32_t, sk_sp<SkImage>> cachedBlurs; // if multiple layers have blur, then we need to take a snapshot now because |