Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/nine_patch_layer_impl_unittest.cc

Issue 1983803003: Revert of cc: nine patch: add occlusion support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/nine_patch_layer_impl.cc ('k') | mash/wm/shadow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/nine_patch_layer_impl_unittest.cc
diff --git a/cc/layers/nine_patch_layer_impl_unittest.cc b/cc/layers/nine_patch_layer_impl_unittest.cc
index 55536f54137b8d12343b1ef8475531b51add5b5e..ac0def87a82c0b5a22b88f8435ba208d8c18f61b 100644
--- a/cc/layers/nine_patch_layer_impl_unittest.cc
+++ b/cc/layers/nine_patch_layer_impl_unittest.cc
@@ -35,28 +35,14 @@
const gfx::Rect& aperture_rect,
const gfx::Size& layer_size,
const gfx::Rect& border,
- const gfx::Rect& occlusion,
bool fill_center,
size_t expected_quad_size) {
std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_layer_rect(layer_size);
- gfx::Rect expected_layer_remaining;
- gfx::Rect expected_tex_remaining;
-
- if (!occlusion.IsEmpty()) {
- expected_layer_remaining = occlusion;
- expected_tex_remaining.SetRect(
- occlusion.x(), occlusion.y(),
- (bitmap_size.width() - occlusion.x()) -
- (layer_size.width() - occlusion.right()),
- (bitmap_size.height() - occlusion.y()) -
- (layer_size.height() - occlusion.bottom()));
- } else {
- expected_layer_remaining.SetRect(border.x(), border.y(),
- layer_size.width() - border.width(),
- layer_size.height() - border.height());
- expected_tex_remaining = aperture_rect;
- }
+ gfx::Rect expected_remaining(border.x(),
+ border.y(),
+ layer_size.width() - border.width(),
+ layer_size.height() - border.height());
FakeImplTaskRunnerProvider task_runner_provider;
TestSharedBitmapManager shared_bitmap_manager;
@@ -80,7 +66,7 @@
host_impl.CreateUIResource(uid, bitmap);
layer->SetUIResourceId(uid);
layer->SetImageBounds(bitmap_size);
- layer->SetLayout(aperture_rect, border, occlusion, fill_center, false);
+ layer->SetLayout(aperture_rect, border, fill_center, false);
AppendQuadsData data;
layer->AppendQuads(render_pass.get(), &data);
@@ -88,21 +74,21 @@
const QuadList& quads = render_pass->quad_list;
EXPECT_EQ(expected_quad_size, quads.size());
- Region layer_remaining(visible_layer_rect);
+ Region remaining(visible_layer_rect);
for (auto iter = quads.cbegin(); iter != quads.cend(); ++iter) {
gfx::Rect quad_rect = iter->rect;
EXPECT_TRUE(visible_layer_rect.Contains(quad_rect)) << iter.index();
- EXPECT_TRUE(layer_remaining.Contains(quad_rect)) << iter.index();
- layer_remaining.Subtract(Region(quad_rect));
+ EXPECT_TRUE(remaining.Contains(quad_rect)) << iter.index();
+ remaining.Subtract(Region(quad_rect));
}
// Check if the left-over quad is the same size as the mapped aperture quad in
// layer space.
if (!fill_center) {
- EXPECT_EQ(expected_layer_remaining, layer_remaining.bounds());
+ EXPECT_EQ(expected_remaining, remaining.bounds());
} else {
- EXPECT_TRUE(layer_remaining.bounds().IsEmpty());
+ EXPECT_TRUE(remaining.bounds().IsEmpty());
}
// Verify UV rects
@@ -117,11 +103,11 @@
}
if (!fill_center) {
- EXPECT_EQ(expected_tex_remaining, tex_remaining.bounds());
- Region aperture_region(expected_tex_remaining);
+ EXPECT_EQ(aperture_rect, tex_remaining.bounds());
+ Region aperture_region(aperture_rect);
EXPECT_EQ(aperture_region, tex_remaining);
} else {
- EXPECT_TRUE(layer_remaining.bounds().IsEmpty());
+ EXPECT_TRUE(remaining.bounds().IsEmpty());
}
}
@@ -134,8 +120,12 @@
gfx::Rect border(40, 40, 80, 80);
bool fill_center = false;
size_t expected_quad_size = 8;
- NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
- gfx::Rect(), fill_center, expected_quad_size);
+ NinePatchLayerLayoutTest(bitmap_size,
+ aperture_rect,
+ layer_size,
+ border,
+ fill_center,
+ expected_quad_size);
// The bounds of the layer are set to less than the bitmap size.
bitmap_size = gfx::Size(100, 100);
@@ -144,8 +134,12 @@
border = gfx::Rect(10, 10, 25, 15);
fill_center = true;
expected_quad_size = 9;
- NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
- gfx::Rect(), fill_center, expected_quad_size);
+ NinePatchLayerLayoutTest(bitmap_size,
+ aperture_rect,
+ layer_size,
+ border,
+ fill_center,
+ expected_quad_size);
// Layer and image sizes are equal.
bitmap_size = gfx::Size(100, 100);
@@ -154,21 +148,12 @@
border = gfx::Rect(20, 30, 40, 50);
fill_center = true;
expected_quad_size = 9;
- NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
- gfx::Rect(), fill_center, expected_quad_size);
-}
-
-TEST(NinePatchLayerImplTest, VerifyDrawQuadsWithOcclusion) {
- // Input is a 100x100 bitmap with a 40x50 aperture at x=20, y=30.
- // The bounds of the layer are set to 400x400.
- gfx::Size bitmap_size(100, 100);
- gfx::Rect aperture_rect(30, 30, 40, 40);
- gfx::Size layer_size(400, 400);
- gfx::Rect occlusion(20, 20, 360, 360);
- bool fill_center = false;
- size_t expected_quad_size = 12;
- NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, gfx::Rect(),
- occlusion, fill_center, expected_quad_size);
+ NinePatchLayerLayoutTest(bitmap_size,
+ aperture_rect,
+ layer_size,
+ border,
+ fill_center,
+ expected_quad_size);
}
TEST(NinePatchLayerImplTest, VerifyDrawQuadsWithEmptyPatches) {
@@ -180,8 +165,12 @@
gfx::Rect border(10, 0, 20, 10);
bool fill_center = false;
size_t expected_quad_size = 5;
- NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
- gfx::Rect(), fill_center, expected_quad_size);
+ NinePatchLayerLayoutTest(bitmap_size,
+ aperture_rect,
+ layer_size,
+ border,
+ fill_center,
+ expected_quad_size);
// The top and left components of the 9-patch are empty, so there should be no
// quads for the left and top components.
@@ -191,8 +180,12 @@
border = gfx::Rect(0, 0, 10, 10);
fill_center = false;
expected_quad_size = 3;
- NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
- gfx::Rect(), fill_center, expected_quad_size);
+ NinePatchLayerLayoutTest(bitmap_size,
+ aperture_rect,
+ layer_size,
+ border,
+ fill_center,
+ expected_quad_size);
// The aperture is the size of the bitmap and the center doesn't draw.
bitmap_size = gfx::Size(100, 100);
@@ -201,8 +194,12 @@
border = gfx::Rect(0, 0, 0, 0);
fill_center = false;
expected_quad_size = 0;
- NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
- gfx::Rect(), fill_center, expected_quad_size);
+ NinePatchLayerLayoutTest(bitmap_size,
+ aperture_rect,
+ layer_size,
+ border,
+ fill_center,
+ expected_quad_size);
// The aperture is the size of the bitmap and the center does draw.
bitmap_size = gfx::Size(100, 100);
@@ -211,8 +208,12 @@
border = gfx::Rect(0, 0, 0, 0);
fill_center = true;
expected_quad_size = 1;
- NinePatchLayerLayoutTest(bitmap_size, aperture_rect, layer_size, border,
- gfx::Rect(), fill_center, expected_quad_size);
+ NinePatchLayerLayoutTest(bitmap_size,
+ aperture_rect,
+ layer_size,
+ border,
+ fill_center,
+ expected_quad_size);
}
TEST(NinePatchLayerImplTest, Occlusion) {
@@ -237,7 +238,7 @@
gfx::Rect aperture = gfx::Rect(3, 3, 4, 4);
gfx::Rect border = gfx::Rect(300, 300, 400, 400);
- nine_patch_layer_impl->SetLayout(aperture, border, gfx::Rect(), true, false);
+ nine_patch_layer_impl->SetLayout(aperture, border, true, false);
impl.CalcDrawProps(viewport_size);
@@ -315,8 +316,7 @@
gfx::Rect aperture = gfx::Rect(3, 3, 4, 4);
gfx::Rect border = gfx::Rect(300, 300, 400, 400);
- nine_patch_layer_impl->SetLayout(aperture, border, gfx::Rect(), true,
- false);
+ nine_patch_layer_impl->SetLayout(aperture, border, true, false);
impl.AppendQuadsWithOcclusion(nine_patch_layer_impl, gfx::Rect());
« no previous file with comments | « cc/layers/nine_patch_layer_impl.cc ('k') | mash/wm/shadow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698