Index: cc/trees/layer_tree_host_impl_unittest.cc |
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc |
index 5694c01aaa37565bec2f4254a0a41db9cb8092da..20d5a2474ee112f7f7ce028f439f6a8bd3758a0a 100644 |
--- a/cc/trees/layer_tree_host_impl_unittest.cc |
+++ b/cc/trees/layer_tree_host_impl_unittest.cc |
@@ -5373,7 +5373,11 @@ TEST_F(LayerTreeHostImplTest, MaskLayerWithScaling) { |
EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(), |
render_pass_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- render_pass_quad->mask_uv_rect.ToString()); |
+ render_pass_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ render_pass_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(scaling_layer_size.ToString(), |
+ render_pass_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5402,7 +5406,11 @@ TEST_F(LayerTreeHostImplTest, MaskLayerWithScaling) { |
EXPECT_EQ(gfx::Rect(0, 0, 200, 200).ToString(), |
render_pass_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- render_pass_quad->mask_uv_rect.ToString()); |
+ render_pass_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ render_pass_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(scaling_layer_size.ToString(), |
+ render_pass_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5433,7 +5441,11 @@ TEST_F(LayerTreeHostImplTest, MaskLayerWithScaling) { |
EXPECT_EQ(gfx::Rect(0, 0, 200, 200).ToString(), |
render_pass_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- render_pass_quad->mask_uv_rect.ToString()); |
+ render_pass_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ render_pass_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(content_bounds.ToString(), |
+ render_pass_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5494,7 +5506,11 @@ TEST_F(LayerTreeHostImplTest, MaskLayerWithDifferentBounds) { |
EXPECT_EQ(gfx::Rect(0, 0, 50, 50).ToString(), |
render_pass_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- render_pass_quad->mask_uv_rect.ToString()); |
+ render_pass_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ render_pass_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size.ToString(), |
+ render_pass_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5522,7 +5538,11 @@ TEST_F(LayerTreeHostImplTest, MaskLayerWithDifferentBounds) { |
EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(), |
render_pass_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- render_pass_quad->mask_uv_rect.ToString()); |
+ render_pass_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ render_pass_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size.ToString(), |
+ render_pass_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5553,7 +5573,11 @@ TEST_F(LayerTreeHostImplTest, MaskLayerWithDifferentBounds) { |
EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(), |
render_pass_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- render_pass_quad->mask_uv_rect.ToString()); |
+ render_pass_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ render_pass_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size_large.ToString(), |
+ render_pass_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5579,7 +5603,11 @@ TEST_F(LayerTreeHostImplTest, MaskLayerWithDifferentBounds) { |
EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(), |
render_pass_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- render_pass_quad->mask_uv_rect.ToString()); |
+ render_pass_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ render_pass_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size.ToString(), |
+ render_pass_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5644,7 +5672,10 @@ TEST_F(LayerTreeHostImplTest, ReflectionMaskLayerWithDifferentBounds) { |
EXPECT_EQ(gfx::Rect(0, 0, 50, 50).ToString(), |
replica_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- replica_quad->mask_uv_rect.ToString()); |
+ replica_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ replica_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size.ToString(), replica_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5671,7 +5702,10 @@ TEST_F(LayerTreeHostImplTest, ReflectionMaskLayerWithDifferentBounds) { |
EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(), |
replica_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- replica_quad->mask_uv_rect.ToString()); |
+ replica_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ replica_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size.ToString(), replica_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5701,7 +5735,11 @@ TEST_F(LayerTreeHostImplTest, ReflectionMaskLayerWithDifferentBounds) { |
EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(), |
replica_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- replica_quad->mask_uv_rect.ToString()); |
+ replica_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ replica_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size_large.ToString(), |
+ replica_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5726,7 +5764,10 @@ TEST_F(LayerTreeHostImplTest, ReflectionMaskLayerWithDifferentBounds) { |
EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(), |
replica_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), |
- replica_quad->mask_uv_rect.ToString()); |
+ replica_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(), |
+ replica_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size.ToString(), replica_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5812,7 +5853,11 @@ TEST_F(LayerTreeHostImplTest, ReflectionMaskLayerForSurfaceWithUnclippedChild) { |
EXPECT_EQ(gfx::Rect(0, 0, 100, 50).ToString(), |
replica_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(0.f, 0.f, 2.f, 1.f).ToString(), |
- replica_quad->mask_uv_rect.ToString()); |
+ replica_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(2.f, 1.f).ToString(), |
+ replica_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(gfx::Size(mask_size).ToString(), |
+ replica_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5845,7 +5890,11 @@ TEST_F(LayerTreeHostImplTest, ReflectionMaskLayerForSurfaceWithUnclippedChild) { |
EXPECT_EQ(gfx::Rect(-50, 0, 100, 50).ToString(), |
replica_quad->rect.ToString()); |
EXPECT_EQ(gfx::RectF(-1.f, 0.f, 2.f, 1.f).ToString(), |
- replica_quad->mask_uv_rect.ToString()); |
+ replica_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(2.f, 1.f).ToString(), |
+ replica_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(gfx::Size(mask_size).ToString(), |
+ replica_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |
@@ -5929,14 +5978,17 @@ TEST_F(LayerTreeHostImplTest, MaskLayerForSurfaceWithClippedLayer) { |
frame.render_passes[0]->quad_list.front()); |
EXPECT_EQ(gfx::Rect(20, 10, 10, 20).ToString(), |
render_pass_quad->rect.ToString()); |
- |
// The masked layer is 50x50, but the surface size is 10x20. So the texture |
// coords in the mask are scaled by 10/50 and 20/50. |
// The surface is clipped to (20,10) so the mask texture coords are offset |
// by 20/50 and 10/50 |
- EXPECT_EQ(gfx::ScaleRect(gfx::RectF(20.f, 10.f, 10.f, 20.f), |
- 1.f / 50.f).ToString(), |
- render_pass_quad->mask_uv_rect.ToString()); |
+ EXPECT_EQ(gfx::ScaleRect(gfx::RectF(20.f, 10.f, 10.f, 20.f), 1.f / 50.f) |
+ .ToString(), |
danakj
2014/10/15 15:33:35
not need to ToString anymore
enne (OOO)
2014/10/15 19:10:55
PUNT
|
+ render_pass_quad->mask_uv_rect().ToString()); |
+ EXPECT_EQ(gfx::Vector2dF(10.f / 50.f, 20.f / 50.f).ToString(), |
+ render_pass_quad->mask_uv_scale.ToString()); |
+ EXPECT_EQ(mask_size.ToString(), |
+ render_pass_quad->mask_texture_size.ToString()); |
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now()); |
host_impl_->DidDrawAllLayers(frame); |