summaryrefslogtreecommitdiffstats
path: root/chromium/cc/layers/ui_resource_layer_impl_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/cc/layers/ui_resource_layer_impl_unittest.cc')
-rw-r--r--chromium/cc/layers/ui_resource_layer_impl_unittest.cc63
1 files changed, 30 insertions, 33 deletions
diff --git a/chromium/cc/layers/ui_resource_layer_impl_unittest.cc b/chromium/cc/layers/ui_resource_layer_impl_unittest.cc
index db2f6d25863..e7337ea871f 100644
--- a/chromium/cc/layers/ui_resource_layer_impl_unittest.cc
+++ b/chromium/cc/layers/ui_resource_layer_impl_unittest.cc
@@ -12,7 +12,7 @@
#include "cc/test/fake_layer_tree_frame_sink.h"
#include "cc/test/fake_layer_tree_host_impl.h"
#include "cc/test/fake_ui_resource_layer_tree_host_impl.h"
-#include "cc/test/layer_test_common.h"
+#include "cc/test/layer_tree_impl_test_base.h"
#include "cc/test/test_task_graph_runner.h"
#include "cc/trees/single_thread_proxy.h"
#include "components/viz/common/quads/draw_quad.h"
@@ -23,7 +23,7 @@
namespace cc {
namespace {
-std::unique_ptr<UIResourceLayerImpl> GenerateUIResourceLayer(
+UIResourceLayerImpl* GenerateUIResourceLayer(
FakeUIResourceLayerTreeHostImpl* host_impl,
const gfx::Size& bitmap_size,
const gfx::Size& layer_size,
@@ -34,27 +34,28 @@ std::unique_ptr<UIResourceLayerImpl> GenerateUIResourceLayer(
UIResourceLayerImpl::Create(host_impl->active_tree(), 1);
layer->draw_properties().visible_layer_rect = visible_layer_rect;
layer->SetBounds(layer_size);
- layer->test_properties()->force_render_surface = true;
UIResourceBitmap bitmap(bitmap_size, opaque);
host_impl->CreateUIResource(uid, bitmap);
layer->SetUIResourceId(uid);
- return layer;
+ host_impl->active_tree()->property_trees()->clear();
+ auto* layer_ptr = layer.get();
+ SetupRootProperties(layer_ptr);
+ host_impl->active_tree()->SetRootLayerForTesting(std::move(layer));
+ UpdateDrawProperties(host_impl->active_tree());
+
+ return layer_ptr;
}
void QuadSizeTest(FakeUIResourceLayerTreeHostImpl* host_impl,
- std::unique_ptr<UIResourceLayerImpl> layer,
+ UIResourceLayerImpl* layer,
size_t expected_quad_size) {
- host_impl->active_tree()->SetRootLayerForTesting(std::move(layer));
- host_impl->active_tree()->BuildPropertyTreesForTesting();
-
std::unique_ptr<viz::RenderPass> render_pass = viz::RenderPass::Create();
AppendQuadsData data;
- host_impl->active_tree()->root_layer_for_testing()->AppendQuads(
- render_pass.get(), &data);
+ host_impl->active_tree()->root_layer()->AppendQuads(render_pass.get(), &data);
// Verify quad rects
const viz::QuadList& quads = render_pass->quad_list;
@@ -79,9 +80,9 @@ TEST(UIResourceLayerImplTest, VerifyDrawQuads) {
size_t expected_quad_size = 1;
bool opaque = true;
UIResourceId uid = 1;
- std::unique_ptr<UIResourceLayerImpl> layer =
+ auto* layer =
GenerateUIResourceLayer(&host_impl, bitmap_size, layer_size, opaque, uid);
- QuadSizeTest(&host_impl, std::move(layer), expected_quad_size);
+ QuadSizeTest(&host_impl, layer, expected_quad_size);
host_impl.DeleteUIResource(uid);
// Make sure we're not appending quads when there are invalid values.
@@ -92,21 +93,17 @@ TEST(UIResourceLayerImplTest, VerifyDrawQuads) {
layer_size,
opaque,
uid);
- QuadSizeTest(&host_impl, std::move(layer), expected_quad_size);
+ QuadSizeTest(&host_impl, layer, expected_quad_size);
host_impl.DeleteUIResource(uid);
}
void NeedsBlendingTest(FakeUIResourceLayerTreeHostImpl* host_impl,
- std::unique_ptr<UIResourceLayerImpl> layer,
+ UIResourceLayerImpl* layer,
bool needs_blending) {
- host_impl->active_tree()->SetRootLayerForTesting(std::move(layer));
- host_impl->active_tree()->BuildPropertyTreesForTesting();
-
std::unique_ptr<viz::RenderPass> render_pass = viz::RenderPass::Create();
AppendQuadsData data;
- host_impl->active_tree()->root_layer_for_testing()->AppendQuads(
- render_pass.get(), &data);
+ host_impl->active_tree()->root_layer()->AppendQuads(render_pass.get(), &data);
// Verify needs_blending is set appropriately.
const viz::QuadList& quads = render_pass->quad_list;
@@ -132,9 +129,9 @@ TEST(UIResourceLayerImplTest, VerifySetOpaqueOnSkBitmap) {
gfx::Size layer_size(100, 100);
bool opaque = false;
UIResourceId uid = 1;
- std::unique_ptr<UIResourceLayerImpl> layer =
+ auto* layer =
GenerateUIResourceLayer(&host_impl, bitmap_size, layer_size, opaque, uid);
- NeedsBlendingTest(&host_impl, std::move(layer), !opaque);
+ NeedsBlendingTest(&host_impl, layer, !opaque);
host_impl.DeleteUIResource(uid);
opaque = true;
@@ -143,7 +140,7 @@ TEST(UIResourceLayerImplTest, VerifySetOpaqueOnSkBitmap) {
layer_size,
opaque,
uid);
- NeedsBlendingTest(&host_impl, std::move(layer), !opaque);
+ NeedsBlendingTest(&host_impl, layer, !opaque);
host_impl.DeleteUIResource(uid);
}
@@ -161,18 +158,18 @@ TEST(UIResourceLayerImplTest, VerifySetOpaqueOnLayer) {
gfx::Size layer_size(100, 100);
bool skbitmap_opaque = false;
UIResourceId uid = 1;
- std::unique_ptr<UIResourceLayerImpl> layer = GenerateUIResourceLayer(
- &host_impl, bitmap_size, layer_size, skbitmap_opaque, uid);
+ auto* layer = GenerateUIResourceLayer(&host_impl, bitmap_size, layer_size,
+ skbitmap_opaque, uid);
bool opaque = false;
layer->SetContentsOpaque(opaque);
- NeedsBlendingTest(&host_impl, std::move(layer), !opaque);
+ NeedsBlendingTest(&host_impl, layer, !opaque);
host_impl.DeleteUIResource(uid);
opaque = true;
layer = GenerateUIResourceLayer(
&host_impl, bitmap_size, layer_size, skbitmap_opaque, uid);
layer->SetContentsOpaque(true);
- NeedsBlendingTest(&host_impl, std::move(layer), !opaque);
+ NeedsBlendingTest(&host_impl, layer, !opaque);
host_impl.DeleteUIResource(uid);
}
@@ -180,7 +177,7 @@ TEST(UIResourceLayerImplTest, Occlusion) {
gfx::Size layer_size(1000, 1000);
gfx::Size viewport_size(1000, 1000);
- LayerTestCommon::LayerImplTest impl;
+ LayerTreeImplTestBase impl;
SkBitmap sk_bitmap;
sk_bitmap.allocN32Pixels(10, 10);
@@ -190,10 +187,11 @@ TEST(UIResourceLayerImplTest, Occlusion) {
impl.host_impl()->CreateUIResource(uid, bitmap);
UIResourceLayerImpl* ui_resource_layer_impl =
- impl.AddChildToRoot<UIResourceLayerImpl>();
+ impl.AddLayer<UIResourceLayerImpl>();
ui_resource_layer_impl->SetBounds(layer_size);
ui_resource_layer_impl->SetDrawsContent(true);
ui_resource_layer_impl->SetUIResourceId(uid);
+ CopyProperties(impl.root_layer(), ui_resource_layer_impl);
impl.CalcDrawProps(viewport_size);
@@ -202,8 +200,7 @@ TEST(UIResourceLayerImplTest, Occlusion) {
gfx::Rect occluded;
impl.AppendQuadsWithOcclusion(ui_resource_layer_impl, occluded);
- LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(),
- gfx::Rect(layer_size));
+ VerifyQuadsExactlyCoverRect(impl.quad_list(), gfx::Rect(layer_size));
EXPECT_EQ(1u, impl.quad_list().size());
}
@@ -212,7 +209,7 @@ TEST(UIResourceLayerImplTest, Occlusion) {
gfx::Rect occluded(ui_resource_layer_impl->visible_layer_rect());
impl.AppendQuadsWithOcclusion(ui_resource_layer_impl, occluded);
- LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(), gfx::Rect());
+ VerifyQuadsExactlyCoverRect(impl.quad_list(), gfx::Rect());
EXPECT_EQ(impl.quad_list().size(), 0u);
}
@@ -222,8 +219,8 @@ TEST(UIResourceLayerImplTest, Occlusion) {
impl.AppendQuadsWithOcclusion(ui_resource_layer_impl, occluded);
size_t partially_occluded_count = 0;
- LayerTestCommon::VerifyQuadsAreOccluded(
- impl.quad_list(), occluded, &partially_occluded_count);
+ VerifyQuadsAreOccluded(impl.quad_list(), occluded,
+ &partially_occluded_count);
// The layer outputs one quad, which is partially occluded.
EXPECT_EQ(1u, impl.quad_list().size());
EXPECT_EQ(1u, partially_occluded_count);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 19:34:23 +0000