commit 247b24184d3a577b16427e97db318833418df9ee
author Leon Scroggins III <scroggo@google.com> Wed Jul 19 15:16:15 2023 -0400
committer Leon Scroggins <scroggo@google.com> Wed Jul 26 15:47:52 2023 +0000
tree e3419c5b4915e6aa984840481227149bb3b4d985
parent ce68dd7ef342d1ea1e626609135963204a917986

RenderEngine: don't blur when using protected content

Work around a bug by skipping blur when using protected content.

Bug: 244398863
Bug: 270314344
Bug: 205516620
Bug: 242266174
Bug: 213116783
Test: manual (ExoPlayer)
Change-Id: Ifcacbd4c44aee1a504a7c46f3fece51004ed7f37
(cherry picked from commit 4623eeb2afef7c0090236da7ea0ab4930683ad58)
Merged-In: Ifcacbd4c44aee1a504a7c46f3fece51004ed7f37

libs/renderengine/skia/SkiaRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaRenderEngine.cpp b/libs/renderengine/skia/SkiaRenderEngine.cpp
index fda6ea1..135d6c54 100644
--- a/libs/renderengine/skia/SkiaRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaRenderEngine.cpp
@@ -711,7 +711,9 @@
     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 @@
         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