cc/trees/layer_tree_host_unittest.cc - Issue 1647573002: cc cleanup: simplify mask_uv_scale and MaskUVRect().

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 1647573002: cc cleanup: simplify mask_uv_scale and MaskUVRect(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

Index: cc/trees/layer_tree_host_unittest.cc

diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc

index 62c620643b95ac62fe7f252dd4d5915329f764f8..4325ee38b1bd49017e329f7dcfeb827e1104e6de 100644

--- a/cc/trees/layer_tree_host_unittest.cc

+++ b/cc/trees/layer_tree_host_unittest.cc

@@ -6019,7 +6019,7 @@ class LayerTreeTestMaskLayerForSurfaceWithClippedLayer : public LayerTreeTest {

EXPECT_EQ(gfx::ScaleRect(gfx::RectF(20.f, 10.f, 10.f, 20.f), 1.f / 50.f)

.ToString(),

render_pass_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(10.f / 50.f, 20.f / 50.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(1.f / 50.f, 1.f / 50.f).ToString(),

render_pass_quad->mask_uv_scale.ToString());

EndTest();

return draw_result;

@@ -6102,7 +6102,7 @@ class LayerTreeTestMaskLayerWithScaling : public LayerTreeTest {

render_pass_quad->rect.ToString());

EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),

render_pass_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(0.01f, 0.01f).ToString(),

render_pass_quad->mask_uv_scale.ToString());

break;

case 1:

@@ -6112,7 +6112,7 @@ class LayerTreeTestMaskLayerWithScaling : public LayerTreeTest {

render_pass_quad->rect.ToString());

EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),

render_pass_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(0.005f, 0.005f).ToString(),

render_pass_quad->mask_uv_scale.ToString());

EndTest();

break;

@@ -6190,7 +6190,7 @@ class LayerTreeTestMaskLayerWithDifferentBounds : public LayerTreeTest {

render_pass_quad->rect.ToString());

EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),

render_pass_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(0.02f, 0.02f).ToString(),

render_pass_quad->mask_uv_scale.ToString());

break;

case 1:

@@ -6200,7 +6200,7 @@ class LayerTreeTestMaskLayerWithDifferentBounds : public LayerTreeTest {

render_pass_quad->rect.ToString());

EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),

render_pass_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(0.01f, 0.01f).ToString(),

render_pass_quad->mask_uv_scale.ToString());

EndTest();

break;

@@ -6283,7 +6283,7 @@ class LayerTreeTestReflectionMaskLayerWithDifferentBounds

render_pass_quad->rect.ToString());

EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),

render_pass_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(0.02f, 0.02f).ToString(),

render_pass_quad->mask_uv_scale.ToString());

break;

case 1:

@@ -6293,7 +6293,7 @@ class LayerTreeTestReflectionMaskLayerWithDifferentBounds

render_pass_quad->rect.ToString());

EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),

render_pass_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(0.01f, 0.01f).ToString(),

render_pass_quad->mask_uv_scale.ToString());

EndTest();

break;

@@ -6383,7 +6383,7 @@ class LayerTreeTestReflectionMaskLayerForSurfaceWithUnclippedChild

replica_quad->rect.ToString());

EXPECT_EQ(gfx::RectF(0.f, 0.f, 2.f, 1.f).ToString(),

replica_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(2.f, 1.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(0.02f, 0.02f).ToString(),

replica_quad->mask_uv_scale.ToString());

break;

case 1:

@@ -6393,7 +6393,7 @@ class LayerTreeTestReflectionMaskLayerForSurfaceWithUnclippedChild

replica_quad->rect.ToString());

EXPECT_EQ(gfx::RectF(-1.f, 0.f, 2.f, 1.f).ToString(),

replica_quad->MaskUVRect().ToString());

- EXPECT_EQ(gfx::Vector2dF(2.f, 1.f).ToString(),

+ EXPECT_EQ(gfx::Vector2dF(0.02f, 0.02f).ToString(),

replica_quad->mask_uv_scale.ToString());

EndTest();

break;

« no previous file with comments | « cc/quads/render_pass_draw_quad.cc ('k') | no next file » | no next file with comments »