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

switch from MockCanvas to DisplayListBuilder in layer unit tests #41889

Merged
merged 1 commit into from
May 10, 2023
Merged

switch from MockCanvas to DisplayListBuilder in layer unit tests #41889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions display_list/display_list_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,22 @@ class DisplayListTestBase : public BaseT {
};
using DisplayListTest = DisplayListTestBase<::testing::Test>;

TEST_F(DisplayListTest, EmptyBuild) {
DisplayListBuilder builder;
auto dl = builder.Build();
EXPECT_EQ(dl->op_count(), 0u);
EXPECT_EQ(dl->bytes(), sizeof(DisplayList));
}

TEST_F(DisplayListTest, EmptyRebuild) {
DisplayListBuilder builder;
auto dl1 = builder.Build();
auto dl2 = builder.Build();
auto dl3 = builder.Build();
ASSERT_TRUE(dl1->Equals(dl2));
ASSERT_TRUE(dl2->Equals(dl3));
}

TEST_F(DisplayListTest, BuilderCanBeReused) {
DisplayListBuilder builder(kTestBounds);
builder.DrawRect(kTestBounds, DlPaint());
Expand Down
21 changes: 12 additions & 9 deletions display_list/dl_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,15 +578,18 @@ void DisplayListBuilder::Transform2DAffine(
SkScalar myx, SkScalar myy, SkScalar myt) {
if (SkScalarsAreFinite(mxx, myx) &&
SkScalarsAreFinite(mxy, myy) &&
SkScalarsAreFinite(mxt, myt) &&
!(mxx == 1 && mxy == 0 && mxt == 0 &&
myx == 0 && myy == 1 && myt == 0)) {
checkForDeferredSave();
Push<Transform2DAffineOp>(0, 1,
mxx, mxy, mxt,
myx, myy, myt);
tracker_.transform2DAffine(mxx, mxy, mxt,
myx, myy, myt);
SkScalarsAreFinite(mxt, myt)) {
if (mxx == 1 && mxy == 0 &&
myx == 0 && myy == 1) {
Translate(mxt, myt);
} else {
checkForDeferredSave();
Push<Transform2DAffineOp>(0, 1,
mxx, mxy, mxt,
myx, myy, myt);
tracker_.transform2DAffine(mxx, mxy, mxt,
myx, myy, myt);
}
}
}
// full 4x4 transform in row major order
Expand Down
12 changes: 9 additions & 3 deletions display_list/dl_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,17 @@ class DisplayListBuilder final : public virtual DlCanvas,
SkMatrix GetTransform() const override { return tracker_.matrix_3x3(); }

// |DlCanvas|
void ClipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) override;
void ClipRect(const SkRect& rect,
ClipOp clip_op = ClipOp::kIntersect,
bool is_aa = false) override;
// |DlCanvas|
void ClipRRect(const SkRRect& rrect, ClipOp clip_op, bool is_aa) override;
void ClipRRect(const SkRRect& rrect,
ClipOp clip_op = ClipOp::kIntersect,
bool is_aa = false) override;
// |DlCanvas|
void ClipPath(const SkPath& path, ClipOp clip_op, bool is_aa) override;
void ClipPath(const SkPath& path,
ClipOp clip_op = ClipOp::kIntersect,
bool is_aa = false) override;

/// Conservative estimate of the bounds of all outstanding clip operations
/// measured in the coordinate space within which this DisplayList will
Expand Down
198 changes: 142 additions & 56 deletions flow/layers/backdrop_filter_layer_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
#include "flutter/flow/testing/layer_test.h"
#include "flutter/flow/testing/mock_layer.h"
#include "flutter/fml/macros.h"
#include "flutter/testing/mock_canvas.h"
#include "third_party/skia/include/core/SkImageFilter.h"
#include "third_party/skia/include/effects/SkImageFilters.h"

namespace flutter {
namespace testing {
Expand Down Expand Up @@ -72,15 +69,30 @@ TEST_F(BackdropFilterLayerTest, EmptyFilter) {
EXPECT_TRUE(layer->needs_painting(paint_context()));
EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);

layer->Paint(paint_context());
EXPECT_EQ(
mock_canvas().draw_calls(),
std::vector({MockCanvas::DrawCall{
0, MockCanvas::SaveLayerData{child_bounds, DlPaint(),
nullptr, 1}},
MockCanvas::DrawCall{
1, MockCanvas::DrawPathData{child_path, child_paint}},
MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
parent->Paint(display_list_paint_context());
DisplayListBuilder expected_builder;
/* (ClipRect)parent::Paint */ {
expected_builder.Save();
{
expected_builder.ClipRect(child_bounds, DlCanvas::ClipOp::kIntersect,
false);
/* (BackdropFilter)layer::Paint */ {
expected_builder.Save();
{
expected_builder.SaveLayer(&child_bounds, nullptr, nullptr);
{
/* mock_layer::Paint */ {
expected_builder.DrawPath(child_path, child_paint);
}
}
expected_builder.Restore();
}
expected_builder.Restore();
}
}
expected_builder.Restore();
}
EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
}

TEST_F(BackdropFilterLayerTest, SimpleFilter) {
Expand All @@ -104,15 +116,31 @@ TEST_F(BackdropFilterLayerTest, SimpleFilter) {
EXPECT_TRUE(layer->needs_painting(paint_context()));
EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);

layer->Paint(paint_context());
EXPECT_EQ(
mock_canvas().draw_calls(),
std::vector({MockCanvas::DrawCall{
0, MockCanvas::SaveLayerData{child_bounds, DlPaint(),
layer_filter, 1}},
MockCanvas::DrawCall{
1, MockCanvas::DrawPathData{child_path, child_paint}},
MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
parent->Paint(display_list_paint_context());
DisplayListBuilder expected_builder;
/* (ClipRect)parent::Paint */ {
expected_builder.Save();
{
expected_builder.ClipRect(child_bounds, DlCanvas::ClipOp::kIntersect,
false);
/* (BackdropFilter)layer::Paint */ {
expected_builder.Save();
{
expected_builder.SaveLayer(&child_bounds, nullptr,
layer_filter.get());
{
/* mock_layer::Paint */ {
expected_builder.DrawPath(child_path, child_paint);
}
}
expected_builder.Restore();
}
expected_builder.Restore();
}
}
expected_builder.Restore();
}
EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
}

TEST_F(BackdropFilterLayerTest, NonSrcOverBlend) {
Expand All @@ -139,15 +167,32 @@ TEST_F(BackdropFilterLayerTest, NonSrcOverBlend) {
DlPaint filter_paint = DlPaint();
filter_paint.setBlendMode(DlBlendMode::kSrc);

layer->Paint(paint_context());
EXPECT_EQ(
mock_canvas().draw_calls(),
std::vector({MockCanvas::DrawCall{
0, MockCanvas::SaveLayerData{child_bounds, filter_paint,
layer_filter, 1}},
MockCanvas::DrawCall{
1, MockCanvas::DrawPathData{child_path, child_paint}},
MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
parent->Paint(display_list_paint_context());
DisplayListBuilder expected_builder;
/* (ClipRect)parent::Paint */ {
expected_builder.Save();
{
expected_builder.ClipRect(child_bounds, DlCanvas::ClipOp::kIntersect,
false);
/* (BackdropFilter)layer::Paint */ {
expected_builder.Save();
{
DlPaint save_paint = DlPaint().setBlendMode(DlBlendMode::kSrc);
expected_builder.SaveLayer(&child_bounds, &save_paint,
layer_filter.get());
{
/* mock_layer::Paint */ {
expected_builder.DrawPath(child_path, child_paint);
}
}
expected_builder.Restore();
}
expected_builder.Restore();
}
}
expected_builder.Restore();
}
EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
}

TEST_F(BackdropFilterLayerTest, MultipleChildren) {
Expand Down Expand Up @@ -184,17 +229,34 @@ TEST_F(BackdropFilterLayerTest, MultipleChildren) {
EXPECT_EQ(mock_layer1->parent_matrix(), initial_transform);
EXPECT_EQ(mock_layer2->parent_matrix(), initial_transform);

layer->Paint(paint_context());
EXPECT_EQ(
mock_canvas().draw_calls(),
std::vector({MockCanvas::DrawCall{
0, MockCanvas::SaveLayerData{children_bounds, DlPaint(),
layer_filter, 1}},
MockCanvas::DrawCall{
1, MockCanvas::DrawPathData{child_path1, child_paint1}},
MockCanvas::DrawCall{
1, MockCanvas::DrawPathData{child_path2, child_paint2}},
MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
parent->Paint(display_list_paint_context());
DisplayListBuilder expected_builder;
/* (ClipRect)parent::Paint */ {
expected_builder.Save();
{
expected_builder.ClipRect(children_bounds, DlCanvas::ClipOp::kIntersect,
false);
/* (BackdropFilter)layer::Paint */ {
expected_builder.Save();
{
expected_builder.SaveLayer(&children_bounds, nullptr,
layer_filter.get());
{
/* mock_layer1::Paint */ {
expected_builder.DrawPath(child_path1, child_paint1);
}
/* mock_layer2::Paint */ {
expected_builder.DrawPath(child_path2, child_paint2);
}
}
expected_builder.Restore();
}
expected_builder.Restore();
}
}
expected_builder.Restore();
}
EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
}

TEST_F(BackdropFilterLayerTest, Nested) {
Expand Down Expand Up @@ -238,21 +300,45 @@ TEST_F(BackdropFilterLayerTest, Nested) {
EXPECT_EQ(mock_layer1->parent_matrix(), initial_transform);
EXPECT_EQ(mock_layer2->parent_matrix(), initial_transform);

layer1->Paint(paint_context());
EXPECT_EQ(
mock_canvas().draw_calls(),
std::vector({MockCanvas::DrawCall{
0, MockCanvas::SaveLayerData{children_bounds, DlPaint(),
layer_filter1, 1}},
MockCanvas::DrawCall{
1, MockCanvas::DrawPathData{child_path1, child_paint1}},
MockCanvas::DrawCall{
1, MockCanvas::SaveLayerData{children_bounds, DlPaint(),
layer_filter2, 2}},
MockCanvas::DrawCall{
2, MockCanvas::DrawPathData{child_path2, child_paint2}},
MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
parent->Paint(display_list_paint_context());
DisplayListBuilder expected_builder;
/* (ClipRect)parent::Paint */ {
expected_builder.Save();
{
expected_builder.ClipRect(children_bounds, DlCanvas::ClipOp::kIntersect,
false);
/* (BackdropFilter)layer1::Paint */ {
expected_builder.Save();
{
expected_builder.SaveLayer(&children_bounds, nullptr,
layer_filter1.get());
{
/* mock_layer1::Paint */ {
expected_builder.DrawPath(child_path1, child_paint1);
}
/* (BackdropFilter)layer2::Paint */ {
expected_builder.Save();
{
expected_builder.SaveLayer(&children_bounds, nullptr,
layer_filter2.get());
{
/* mock_layer2::Paint */ {
expected_builder.DrawPath(child_path2, child_paint2);
}
}
expected_builder.Restore();
}
expected_builder.Restore();
}
}
expected_builder.Restore();
}
expected_builder.Restore();
}
}
expected_builder.Restore();
}
EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
}

TEST_F(BackdropFilterLayerTest, Readback) {
Expand Down
49 changes: 26 additions & 23 deletions flow/layers/clip_path_layer_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "flutter/flow/testing/mock_embedder.h"
#include "flutter/flow/testing/mock_layer.h"
#include "flutter/fml/macros.h"
#include "flutter/testing/mock_canvas.h"
#include "gtest/gtest.h"

namespace flutter {
Expand Down Expand Up @@ -170,17 +169,19 @@ TEST_F(ClipPathLayerTest, FullyContainedChild) {
EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(layer_path)}));

layer->Paint(paint_context());
EXPECT_EQ(
mock_canvas().draw_calls(),
std::vector(
{MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
MockCanvas::DrawCall{
1, MockCanvas::ClipPathData{layer_path, ClipOp::kIntersect,
MockCanvas::kHard_ClipEdgeStyle}},
MockCanvas::DrawCall{
1, MockCanvas::DrawPathData{child_path, child_paint}},
MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
layer->Paint(display_list_paint_context());
DisplayListBuilder expected_builder;
/* (ClipPath)layer::Paint */ {
expected_builder.Save();
{
expected_builder.ClipPath(layer_path);
/* mock_layer::Paint */ {
expected_builder.DrawPath(child_path, child_paint);
}
}
expected_builder.Restore();
}
EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
}

TEST_F(ClipPathLayerTest, PartiallyContainedChild) {
Expand Down Expand Up @@ -224,17 +225,19 @@ TEST_F(ClipPathLayerTest, PartiallyContainedChild) {
EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(clip_path)}));

layer->Paint(paint_context());
EXPECT_EQ(
mock_canvas().draw_calls(),
std::vector(
{MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
MockCanvas::DrawCall{
1, MockCanvas::ClipPathData{clip_path, ClipOp::kIntersect,
MockCanvas::kHard_ClipEdgeStyle}},
MockCanvas::DrawCall{
1, MockCanvas::DrawPathData{child_path, child_paint}},
MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
layer->Paint(display_list_paint_context());
DisplayListBuilder expected_builder;
/* (ClipPath)layer::Paint */ {
expected_builder.Save();
{
expected_builder.ClipPath(clip_path);
/* mock_layer::Paint */ {
expected_builder.DrawPath(child_path, child_paint);
}
}
expected_builder.Restore();
}
EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
}

static bool ReadbackResult(PrerollContext* context,
Expand Down
Loading