1111#include " flutter/flow/testing/mock_layer.h"
1212#include " flutter/fml/macros.h"
1313#include " flutter/testing/canvas_test.h"
14- #include " flutter/testing/mock_canvas .h"
14+ #include " flutter/testing/display_list_testing .h"
1515#include " gtest/gtest.h"
1616
1717namespace flutter {
1818namespace testing {
19+
1920class LayerTreeTest : public CanvasTest {
2021 public:
2122 LayerTreeTest ()
2223 : root_transform_(SkMatrix::Translate(1 .0f , 1 .0f )),
24+ builder_ (DisplayListBuilder::kMaxCullRect ),
2325 scoped_frame_(compositor_context_.AcquireFrame(nullptr ,
24- &mock_canvas () ,
26+ &builder_ ,
2527 nullptr ,
2628 root_transform_,
2729 false ,
@@ -31,6 +33,7 @@ class LayerTreeTest : public CanvasTest {
3133
3234 CompositorContext::ScopedFrame& frame () { return *scoped_frame_.get (); }
3335 const SkMatrix& root_transform () { return root_transform_; }
36+ sk_sp<DisplayList> display_list () { return builder_.Build (); }
3437
3538 std::unique_ptr<LayerTree> BuildLayerTree (
3639 const std::shared_ptr<Layer>& root_layer) {
@@ -40,6 +43,7 @@ class LayerTreeTest : public CanvasTest {
4043 private:
4144 CompositorContext compositor_context_;
4245 SkMatrix root_transform_;
46+ DisplayListBuilder builder_;
4347 std::unique_ptr<CompositorContext::ScopedFrame> scoped_frame_;
4448};
4549
@@ -62,13 +66,17 @@ TEST_F(LayerTreeTest, PaintBeforePrerollDies) {
6266 layer->Add (mock_layer);
6367
6468 auto layer_tree = BuildLayerTree (layer);
65- EXPECT_EQ (mock_layer->paint_bounds (), kEmptyRect );
66- EXPECT_EQ (layer->paint_bounds (), kEmptyRect );
69+ EXPECT_EQ (mock_layer->paint_bounds (), SkRect::MakeEmpty () );
70+ EXPECT_EQ (layer->paint_bounds (), SkRect::MakeEmpty () );
6771 EXPECT_TRUE (mock_layer->is_empty ());
6872 EXPECT_TRUE (layer->is_empty ());
6973
7074 layer_tree->Paint (frame ());
71- EXPECT_EQ (mock_canvas ().draw_calls (), std::vector<MockCanvas::DrawCall>());
75+
76+ DisplayListBuilder expected_builder;
77+ auto expected_dl = expected_builder.Build ();
78+
79+ EXPECT_TRUE (DisplayListsEQ_Verbose (display_list (), expected_dl));
7280}
7381
7482TEST_F (LayerTreeTest, Simple) {
@@ -88,9 +96,12 @@ TEST_F(LayerTreeTest, Simple) {
8896 EXPECT_EQ (mock_layer->parent_matrix (), root_transform ());
8997
9098 layer_tree->Paint (frame ());
91- EXPECT_EQ (mock_canvas ().draw_calls (),
92- std::vector ({MockCanvas::DrawCall{
93- 0 , MockCanvas::DrawPathData{child_path, child_paint}}}));
99+
100+ DisplayListBuilder expected_builder;
101+ expected_builder.DrawPath (DlPath (child_path), child_paint);
102+ auto expected_dl = expected_builder.Build ();
103+
104+ EXPECT_TRUE (DisplayListsEQ_Verbose (display_list (), expected_dl));
94105}
95106
96107TEST_F (LayerTreeTest, Multiple) {
@@ -122,12 +133,13 @@ TEST_F(LayerTreeTest, Multiple) {
122133 kGiantRect ); // Siblings are independent
123134
124135 layer_tree->Paint (frame ());
125- EXPECT_EQ (
126- mock_canvas ().draw_calls (),
127- std::vector ({MockCanvas::DrawCall{
128- 0 , MockCanvas::DrawPathData{child_path1, child_paint1}},
129- MockCanvas::DrawCall{0 , MockCanvas::DrawPathData{
130- child_path2, child_paint2}}}));
136+
137+ DisplayListBuilder expected_builder;
138+ expected_builder.DrawPath (DlPath (child_path1), child_paint1);
139+ expected_builder.DrawPath (DlPath (child_path2), child_paint2);
140+ auto expected_dl = expected_builder.Build ();
141+
142+ EXPECT_TRUE (DisplayListsEQ_Verbose (display_list (), expected_dl));
131143}
132144
133145TEST_F (LayerTreeTest, MultipleWithEmpty) {
@@ -154,9 +166,12 @@ TEST_F(LayerTreeTest, MultipleWithEmpty) {
154166 EXPECT_EQ (mock_layer2->parent_cull_rect (), kGiantRect );
155167
156168 layer_tree->Paint (frame ());
157- EXPECT_EQ (mock_canvas ().draw_calls (),
158- std::vector ({MockCanvas::DrawCall{
159- 0 , MockCanvas::DrawPathData{child_path1, child_paint1}}}));
169+
170+ DisplayListBuilder expected_builder;
171+ expected_builder.DrawPath (DlPath (child_path1), child_paint1);
172+ auto expected_dl = expected_builder.Build ();
173+
174+ EXPECT_TRUE (DisplayListsEQ_Verbose (display_list (), expected_dl));
160175}
161176
162177TEST_F (LayerTreeTest, NeedsSystemComposite) {
@@ -186,12 +201,13 @@ TEST_F(LayerTreeTest, NeedsSystemComposite) {
186201 EXPECT_EQ (mock_layer2->parent_cull_rect (), kGiantRect );
187202
188203 layer_tree->Paint (frame ());
189- EXPECT_EQ (
190- mock_canvas ().draw_calls (),
191- std::vector ({MockCanvas::DrawCall{
192- 0 , MockCanvas::DrawPathData{child_path1, child_paint1}},
193- MockCanvas::DrawCall{0 , MockCanvas::DrawPathData{
194- child_path2, child_paint2}}}));
204+
205+ DisplayListBuilder expected_builder;
206+ expected_builder.DrawPath (DlPath (child_path1), child_paint1);
207+ expected_builder.DrawPath (DlPath (child_path2), child_paint2);
208+ auto expected_dl = expected_builder.Build ();
209+
210+ EXPECT_TRUE (DisplayListsEQ_Verbose (display_list (), expected_dl));
195211}
196212
197213TEST_F (LayerTreeTest, PrerollContextInitialization) {
0 commit comments