Revert "RenderEngine: don't blur when using protected content"
This reverts commit 247b24184d3a577b16427e97db318833418df9ee.
We've fixed the issue in other CLs, so now we no longer need the
workaround.
Bug: 244398863
Bug: 213116783
Fixes: 270314344
Fixes: 205516620
Fixes: 242266174
Test: manual (ExoPlayer)
Change-Id: I6a7033360840b5caf0b84b56df25a44d9c789988
diff --git a/libs/renderengine/skia/SkiaRenderEngine.cpp b/libs/renderengine/skia/SkiaRenderEngine.cpp
index 709de0d..1f18b94 100644
--- a/libs/renderengine/skia/SkiaRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaRenderEngine.cpp
@@ -709,9 +709,7 @@
SkCanvas* canvas = dstCanvas;
SkiaCapture::OffscreenState offscreenCaptureState;
const LayerSettings* blurCompositionLayer = nullptr;
-
- // TODO (b/270314344): Enable blurs in protected context.
- if (mBlurFilter && !mInProtectedContext) {
+ if (mBlurFilter) {
bool requiresCompositionLayer = false;
for (const auto& layer : layers) {
// if the layer doesn't have blur or it is not visible then continue
@@ -805,8 +803,7 @@
const auto [bounds, roundRectClip] =
getBoundsAndClip(layer.geometry.boundaries, layer.geometry.roundedCornersCrop,
layer.geometry.roundedCornersRadius);
- // TODO (b/270314344): Enable blurs in protected context.
- if (mBlurFilter && layerHasBlur(layer, ctModifiesAlpha) && !mInProtectedContext) {
+ if (mBlurFilter && layerHasBlur(layer, ctModifiesAlpha)) {
std::unordered_map<uint32_t, sk_sp<SkImage>> cachedBlurs;
// if multiple layers have blur, then we need to take a snapshot now because