DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix condition in OpacityLayer where it inherits opacity twice (flutter/engine#33085)

Browse Source
This commit is contained in:
Jim Graham 2022-05-03 18:09:04 -07:00 committed by GitHub
parent b6fc564887
commit b415fb06ef
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/flow/layers/opacity_layer.cc
View File

@ -126,7 +126,9 @@ void OpacityLayer::Paint(PaintContext& context) const {
Layer::AutoSaveLayer save_layer =
Layer::AutoSaveLayer::Create(context, saveLayerBounds, &paint);
context.inherited_opacity = SK_Scalar1;
PaintChildren(context);
context.inherited_opacity = inherited_opacity;
}
} // namespace flutter

59
engine/src/flutter/flow/layers/opacity_layer_unittests.cc
View File

@ -543,7 +543,7 @@ TEST_F(OpacityLayerTest, OpacityInheritanceThroughImageFilter) {
EXPECT_TRUE(opacityLayer->children_can_accept_opacity());
}
TEST_F(OpacityLayerTest, OpacityInheritanceNested) {
TEST_F(OpacityLayerTest, OpacityInheritanceNestedWithCompatibleChild) {
SkPoint offset1 = SkPoint::Make(10, 20);
SkPoint offset2 = SkPoint::Make(20, 10);
SkPath mockPath = SkPath::Rect({10, 10, 20, 20});
@ -603,6 +603,63 @@ TEST_F(OpacityLayerTest, OpacityInheritanceNested) {
EXPECT_TRUE(DisplayListsEQ_Verbose(expected_builder.Build(), display_list()));
}
TEST_F(OpacityLayerTest, OpacityInheritanceNestedWithIncompatibleChild) {
SkPoint offset1 = SkPoint::Make(10, 20);
SkPoint offset2 = SkPoint::Make(20, 10);
SkPath mockPath = SkPath::Rect({10, 10, 20, 20});
auto opacityLayer1 = std::make_shared<OpacityLayer>(128, offset1);
auto opacityLayer2 = std::make_shared<OpacityLayer>(64, offset2);
auto mockLayer = MockLayer::Make(mockPath);
opacityLayer2->Add(mockLayer);
opacityLayer1->Add(opacityLayer2);
PrerollContext* context = preroll_context();
context->subtree_can_inherit_opacity = false;
opacityLayer1->Preroll(context, SkMatrix::I());
EXPECT_TRUE(context->subtree_can_inherit_opacity);
EXPECT_TRUE(opacityLayer1->children_can_accept_opacity());
EXPECT_FALSE(opacityLayer2->children_can_accept_opacity());
SkPaint saveLayerPaint;
SkScalar inheritedOpacity = 128 * 1.0 / SK_AlphaOPAQUE;
inheritedOpacity *= 64 * 1.0 / SK_AlphaOPAQUE;
saveLayerPaint.setAlphaf(inheritedOpacity);
DisplayListBuilder expected_builder;
/* opacityLayer1::Paint */ {
expected_builder.save();
{
expected_builder.translate(offset1.fX, offset1.fY);
#ifndef SUPPORT_FRACTIONAL_TRANSLATION
expected_builder.transformReset();
expected_builder.transform(SkM44::Translate(offset1.fX, offset1.fY));
#endif
/* opacityLayer2::Paint */ {
expected_builder.save();
{
expected_builder.translate(offset2.fX, offset2.fY);
#ifndef SUPPORT_FRACTIONAL_TRANSLATION
expected_builder.transformReset();
expected_builder.transform(SkM44::Translate(offset1.fX + offset2.fX,
offset1.fY + offset2.fY));
#endif
expected_builder.setColor(saveLayerPaint.getAlpha() << 24);
expected_builder.saveLayer(&mockLayer->paint_bounds(), true);
/* mockLayer::Paint */ {
expected_builder.setColor(0xFF000000);
expected_builder.drawPath(mockPath);
}
}
expected_builder.restore();
}
}
expected_builder.restore();
}
opacityLayer1->Paint(display_list_paint_context());
EXPECT_TRUE(DisplayListsEQ_Verbose(expected_builder.Build(), display_list()));
}
using OpacityLayerDiffTest = DiffContextTest;
TEST_F(OpacityLayerDiffTest, FractionalTranslation) {