Revert "[flutter_releases] Apply flutter-2.13 candidate.7 CPs to latest roll (#33169) (#33222)"
This reverts commit 1f603fbfc8b624369e6388a05dbfce252045baa2.
diff --git a/flow/layers/opacity_layer.cc b/flow/layers/opacity_layer.cc
index bda6da9..b234428 100644
--- a/flow/layers/opacity_layer.cc
+++ b/flow/layers/opacity_layer.cc
@@ -126,9 +126,7 @@
Layer::AutoSaveLayer save_layer =
Layer::AutoSaveLayer::Create(context, saveLayerBounds, &paint);
- context.inherited_opacity = SK_Scalar1;
PaintChildren(context);
- context.inherited_opacity = inherited_opacity;
}
} // namespace flutter
diff --git a/flow/layers/opacity_layer_unittests.cc b/flow/layers/opacity_layer_unittests.cc
index c86945a..0362575 100644
--- a/flow/layers/opacity_layer_unittests.cc
+++ b/flow/layers/opacity_layer_unittests.cc
@@ -543,7 +543,7 @@
EXPECT_TRUE(opacityLayer->children_can_accept_opacity());
}
-TEST_F(OpacityLayerTest, OpacityInheritanceNestedWithCompatibleChild) {
+TEST_F(OpacityLayerTest, OpacityInheritanceNested) {
SkPoint offset1 = SkPoint::Make(10, 20);
SkPoint offset2 = SkPoint::Make(20, 10);
SkPath mockPath = SkPath::Rect({10, 10, 20, 20});
@@ -603,63 +603,6 @@
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) {
diff --git a/fml/log_settings.cc b/fml/log_settings.cc
index 93df3d4..4388a1a 100644
--- a/fml/log_settings.cc
+++ b/fml/log_settings.cc
@@ -9,7 +9,6 @@
#include <algorithm>
#include <cstring>
#include <iostream>
-#include <limits>
#include "flutter/fml/build_config.h"
#include "flutter/fml/logging.h"
@@ -32,11 +31,7 @@
std::min(LOG_FATAL, settings.min_log_level);
#if defined(OS_FUCHSIA)
// Syslog should accept all logs, since filtering by severity is done by fml.
- fx_logger_t* logger = fx_log_get_logger();
- if (logger) {
- fx_logger_set_min_severity(logger,
- std::numeric_limits<fx_log_severity_t>::min());
- }
+ FX_LOG_SET_SEVERITY(ALL);
#endif
}
