Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 84bf729

Browse files
liyuqianliyuqian
authored
Revert PRs to unblock David and Jim's work (#14088)
* Revert "Add flow test fixtures and tests (#13986)" This reverts commit 620f528. * Revert "Dynamically determine whether to use offscreen surface based on need (#13976)" This reverts commit a86ef94.
1 parent 36dc3b5 commit 84bf729

File tree

105 files changed

+424
-4910
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+424
-4910
lines changed

‎BUILD.gn‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,7 @@ group("flutter") {
9595

9696
# Fuchsia currently only supports a subset of our unit tests
9797
if (is_fuchsia) {
98-
public_deps += [
99-
"$flutter_root/flow:flow_tests",
100-
"$flutter_root/fml:fml_tests",
101-
]
98+
public_deps += [ "$flutter_root/fml:fml_tests" ]
10299
}
103100
}
104101

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,24 @@ FILE: ../../../flutter/flow/instrumentation.cc
3030
FILE: ../../../flutter/flow/instrumentation.h
3131
FILE: ../../../flutter/flow/layers/backdrop_filter_layer.cc
3232
FILE: ../../../flutter/flow/layers/backdrop_filter_layer.h
33-
FILE: ../../../flutter/flow/layers/backdrop_filter_layer_unittests.cc
3433
FILE: ../../../flutter/flow/layers/child_scene_layer.cc
3534
FILE: ../../../flutter/flow/layers/child_scene_layer.h
3635
FILE: ../../../flutter/flow/layers/clip_path_layer.cc
3736
FILE: ../../../flutter/flow/layers/clip_path_layer.h
38-
FILE: ../../../flutter/flow/layers/clip_path_layer_unittests.cc
3937
FILE: ../../../flutter/flow/layers/clip_rect_layer.cc
4038
FILE: ../../../flutter/flow/layers/clip_rect_layer.h
41-
FILE: ../../../flutter/flow/layers/clip_rect_layer_unittests.cc
4239
FILE: ../../../flutter/flow/layers/clip_rrect_layer.cc
4340
FILE: ../../../flutter/flow/layers/clip_rrect_layer.h
44-
FILE: ../../../flutter/flow/layers/clip_rrect_layer_unittests.cc
4541
FILE: ../../../flutter/flow/layers/color_filter_layer.cc
4642
FILE: ../../../flutter/flow/layers/color_filter_layer.h
47-
FILE: ../../../flutter/flow/layers/color_filter_layer_unittests.cc
4843
FILE: ../../../flutter/flow/layers/container_layer.cc
4944
FILE: ../../../flutter/flow/layers/container_layer.h
50-
FILE: ../../../flutter/flow/layers/container_layer_unittests.cc
5145
FILE: ../../../flutter/flow/layers/layer.cc
5246
FILE: ../../../flutter/flow/layers/layer.h
5347
FILE: ../../../flutter/flow/layers/layer_tree.cc
5448
FILE: ../../../flutter/flow/layers/layer_tree.h
55-
FILE: ../../../flutter/flow/layers/layer_tree_unittests.cc
56-
FILE: ../../../flutter/flow/layers/layer_unittests.cc
5749
FILE: ../../../flutter/flow/layers/opacity_layer.cc
5850
FILE: ../../../flutter/flow/layers/opacity_layer.h
59-
FILE: ../../../flutter/flow/layers/opacity_layer_unittests.cc
6051
FILE: ../../../flutter/flow/layers/performance_overlay_layer.cc
6152
FILE: ../../../flutter/flow/layers/performance_overlay_layer.h
6253
FILE: ../../../flutter/flow/layers/performance_overlay_layer_unittests.cc
@@ -65,19 +56,14 @@ FILE: ../../../flutter/flow/layers/physical_shape_layer.h
6556
FILE: ../../../flutter/flow/layers/physical_shape_layer_unittests.cc
6657
FILE: ../../../flutter/flow/layers/picture_layer.cc
6758
FILE: ../../../flutter/flow/layers/picture_layer.h
68-
FILE: ../../../flutter/flow/layers/picture_layer_unittests.cc
6959
FILE: ../../../flutter/flow/layers/platform_view_layer.cc
7060
FILE: ../../../flutter/flow/layers/platform_view_layer.h
71-
FILE: ../../../flutter/flow/layers/platform_view_layer_unittests.cc
7261
FILE: ../../../flutter/flow/layers/shader_mask_layer.cc
7362
FILE: ../../../flutter/flow/layers/shader_mask_layer.h
74-
FILE: ../../../flutter/flow/layers/shader_mask_layer_unittests.cc
7563
FILE: ../../../flutter/flow/layers/texture_layer.cc
7664
FILE: ../../../flutter/flow/layers/texture_layer.h
77-
FILE: ../../../flutter/flow/layers/texture_layer_unittests.cc
7865
FILE: ../../../flutter/flow/layers/transform_layer.cc
7966
FILE: ../../../flutter/flow/layers/transform_layer.h
80-
FILE: ../../../flutter/flow/layers/transform_layer_unittests.cc
8167
FILE: ../../../flutter/flow/matrix_decomposition.cc
8268
FILE: ../../../flutter/flow/matrix_decomposition.h
8369
FILE: ../../../flutter/flow/matrix_decomposition_unittests.cc

‎flow/BUILD.gn‎

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
if (is_fuchsia) {
66
import("//build/fuchsia/sdk.gni")
7-
import("$flutter_root/tools/fuchsia/fuchsia_archive.gni")
87
}
8+
99
import("$flutter_root/testing/testing.gni")
1010

1111
source_set("flow") {
@@ -102,102 +102,29 @@ test_fixtures("flow_fixtures") {
102102
fixtures = []
103103
}
104104

105-
source_set("flow_testing") {
106-
testonly = true
107-
108-
sources = [
109-
"testing/layer_test.h",
110-
"testing/mock_layer.cc",
111-
"testing/mock_layer.h",
112-
"testing/mock_texture.cc",
113-
"testing/mock_texture.h",
114-
"testing/skia_gpu_object_layer_test.cc",
115-
"testing/skia_gpu_object_layer_test.h",
116-
]
117-
118-
public_deps = [
119-
":flow",
120-
"$flutter_root/testing:skia",
121-
"//third_party/googletest:gtest",
122-
]
123-
}
124-
125105
executable("flow_unittests") {
126106
testonly = true
127107

128108
sources = [
129109
"flow_run_all_unittests.cc",
130110
"flow_test_utils.cc",
131111
"flow_test_utils.h",
132-
"layers/backdrop_filter_layer_unittests.cc",
133-
"layers/clip_path_layer_unittests.cc",
134-
"layers/clip_rect_layer_unittests.cc",
135-
"layers/clip_rrect_layer_unittests.cc",
136-
"layers/color_filter_layer_unittests.cc",
137-
"layers/container_layer_unittests.cc",
138-
"layers/layer_tree_unittests.cc",
139-
"layers/layer_unittests.cc",
140-
"layers/opacity_layer_unittests.cc",
141112
"layers/performance_overlay_layer_unittests.cc",
142113
"layers/physical_shape_layer_unittests.cc",
143-
"layers/picture_layer_unittests.cc",
144-
"layers/platform_view_layer_unittests.cc",
145-
"layers/shader_mask_layer_unittests.cc",
146-
"layers/texture_layer_unittests.cc",
147-
"layers/transform_layer_unittests.cc",
148114
"matrix_decomposition_unittests.cc",
149115
"mutators_stack_unittests.cc",
150116
"raster_cache_unittests.cc",
151117
"skia_gpu_object_unittests.cc",
152-
"testing/mock_layer_unittests.cc",
153-
"testing/mock_texture_unittests.cc",
154118
"texture_unittests.cc",
155119
]
156120

157121
deps = [
158122
":flow",
159123
":flow_fixtures",
160-
":flow_testing",
161124
"$flutter_root/fml",
162-
"$flutter_root/testing:skia",
163125
"$flutter_root/testing:testing_lib",
164126
"//third_party/dart/runtime:libdart_jit", # for tracing
165127
"//third_party/googletest:gtest",
166128
"//third_party/skia",
167129
]
168130
}
169-
170-
if (is_fuchsia) {
171-
fuchsia_archive("flow_tests") {
172-
testonly = true
173-
174-
deps = [
175-
":flow_unittests",
176-
]
177-
178-
binary = "flow_unittests"
179-
180-
libraries = common_libs
181-
182-
meta_dir = "$flutter_root/testing/fuchsia/meta"
183-
cmx_file = "$meta_dir/fuchsia_test.cmx"
184-
185-
resources = [
186-
{
187-
path = rebase_path(
188-
"$flutter_root/testing/resources/performance_overlay_gold_60fps.png")
189-
dest = "flutter/testing/resources/performance_overlay_gold_60fps.png"
190-
},
191-
{
192-
path = rebase_path(
193-
"$flutter_root/testing/resources/performance_overlay_gold_90fps.png")
194-
dest = "flutter/testing/resources/performance_overlay_gold_90fps.png"
195-
},
196-
{
197-
path = rebase_path(
198-
"$flutter_root/testing/resources/performance_overlay_gold_120fps.png")
199-
dest = "flutter/testing/resources/performance_overlay_gold_120fps.png"
200-
},
201-
]
202-
}
203-
}

‎flow/embedded_views.h‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ class MutatorsStack {
143143
// Returns an iterator pointing to the bottom of the stack.
144144
const std::vector<std::shared_ptr<Mutator>>::const_reverse_iterator Bottom()
145145
const;
146-
bool is_empty() const { return vector_.empty(); }
147146

148147
bool operator==(const MutatorsStack& other) const {
149148
if (vector_.size() != other.vector_.size()) {
@@ -157,26 +156,10 @@ class MutatorsStack {
157156
return true;
158157
}
159158

160-
bool operator==(const std::vector<Mutator>& other) const {
161-
if (vector_.size() != other.size()) {
162-
return false;
163-
}
164-
for (size_t i = 0; i < vector_.size(); i++) {
165-
if (*vector_[i] != other[i]) {
166-
return false;
167-
}
168-
}
169-
return true;
170-
}
171-
172159
bool operator!=(const MutatorsStack& other) const {
173160
return !operator==(other);
174161
}
175162

176-
bool operator!=(const std::vector<Mutator>& other) const {
177-
return !operator==(other);
178-
}
179-
180163
private:
181164
std::vector<std::shared_ptr<Mutator>> vector_;
182165
}; // MutatorsStack

‎flow/flow_run_all_unittests.cc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "flutter/fml/build_config.h"
1817
#include "flutter/fml/command_line.h"
1918
#include "flutter/fml/logging.h"
2019
#include "gtest/gtest.h"
@@ -24,14 +23,8 @@
2423
int main(int argc, char** argv) {
2524
testing::InitGoogleTest(&argc, argv);
2625
fml::CommandLine cmd = fml::CommandLineFromArgcArgv(argc, argv);
27-
28-
#if defined(OS_FUCHSIA)
29-
flutter::SetGoldenDir(cmd.GetOptionValueWithDefault(
30-
"golden-dir", "/pkg/data/flutter/testing/resources"));
31-
#else
3226
flutter::SetGoldenDir(
3327
cmd.GetOptionValueWithDefault("golden-dir", "flutter/testing/resources"));
34-
#endif
3528
flutter::SetFontFile(cmd.GetOptionValueWithDefault(
3629
"font-file",
3730
"flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf"));

‎flow/layers/backdrop_filter_layer.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
namespace flutter {
88

99
BackdropFilterLayer::BackdropFilterLayer(sk_sp<SkImageFilter> filter)
10-
: filter_(std::move(filter)) {
11-
set_layer_reads_surface(filter_.get() != nullptr);
12-
}
10+
: filter_(std::move(filter)) {}
11+
12+
BackdropFilterLayer::~BackdropFilterLayer() = default;
1313

1414
void BackdropFilterLayer::Paint(PaintContext& context) const {
1515
TRACE_EVENT0("flutter", "BackdropFilterLayer::Paint");

‎flow/layers/backdrop_filter_layer.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ namespace flutter {
1414
class BackdropFilterLayer : public ContainerLayer {
1515
public:
1616
BackdropFilterLayer(sk_sp<SkImageFilter> filter);
17+
~BackdropFilterLayer() override;
1718

1819
void Paint(PaintContext& context) const override;
1920

0 commit comments

Comments
 (0)