From 0ffbb1c95846afa31fc83571c7b6c4f25c3ff37a Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Thu, 21 Sep 2023 13:07:55 -0700 Subject: [PATCH 1/2] Remove opacity layer dcheck. --- flow/layers/opacity_layer.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/flow/layers/opacity_layer.cc b/flow/layers/opacity_layer.cc index 8b55dff69aa92..cf6138fd67045 100644 --- a/flow/layers/opacity_layer.cc +++ b/flow/layers/opacity_layer.cc @@ -36,8 +36,6 @@ void OpacityLayer::Diff(DiffContext* context, const Layer* old_layer) { } void OpacityLayer::Preroll(PrerollContext* context) { - FML_DCHECK(!layers().empty()); // We can't be a leaf. - auto mutator = context->state_stack.save(); mutator.translate(offset_); mutator.applyOpacity(SkRect(), DlColor::toOpacity(alpha_)); From 061a4cd2dd2a136062d9b110eb3b994e833e8187 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Thu, 28 Sep 2023 13:34:17 -0700 Subject: [PATCH 2/2] removed test --- flow/layers/opacity_layer_unittests.cc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/flow/layers/opacity_layer_unittests.cc b/flow/layers/opacity_layer_unittests.cc index 71ccdc15c8476..f69ac4ec57f4f 100644 --- a/flow/layers/opacity_layer_unittests.cc +++ b/flow/layers/opacity_layer_unittests.cc @@ -27,14 +27,6 @@ namespace testing { using OpacityLayerTest = LayerTest; #ifndef NDEBUG -TEST_F(OpacityLayerTest, LeafLayer) { - auto layer = - std::make_shared(SK_AlphaOPAQUE, SkPoint::Make(0.0f, 0.0f)); - - EXPECT_DEATH_IF_SUPPORTED(layer->Preroll(preroll_context()), - "\\!layers\\(\\)\\.empty\\(\\)"); -} - TEST_F(OpacityLayerTest, PaintingEmptyLayerDies) { auto mock_layer = std::make_shared(SkPath()); auto layer =