Index: cc/output/overlay_unittest.cc |
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc |
index 22a5d5b80468b1504cf4f84e500c486f32c9c56e..b1aa7e5fe5d5059b8a80d9badcfb9c7ffe3c9d54 100644 |
--- a/cc/output/overlay_unittest.cc |
+++ b/cc/output/overlay_unittest.cc |
@@ -1767,7 +1767,8 @@ class CALayerOverlayRPDQTest : public CALayerOverlayTest { |
TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadNoFilters) { |
quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), |
- filters_, gfx::Vector2dF(1, 1), background_filters_); |
+ filters_, gfx::Vector2dF(1, 1), gfx::PointF(), |
+ background_filters_); |
ProcessForOverlays(); |
EXPECT_EQ(1U, ca_layer_list_.size()); |
@@ -1787,7 +1788,8 @@ TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadAllValidFilters) { |
1.0f, SK_ColorGREEN)); |
quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), |
- filters_, gfx::Vector2dF(1, 1), background_filters_); |
+ filters_, gfx::Vector2dF(1, 1), gfx::PointF(), |
+ background_filters_); |
ProcessForOverlays(); |
EXPECT_EQ(1U, ca_layer_list_.size()); |
@@ -1797,7 +1799,8 @@ TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadOpacityFilterScale) { |
filters_.Append(FilterOperation::CreateOpacityFilter(0.8f)); |
quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), |
- filters_, gfx::Vector2dF(1, 2), background_filters_); |
+ filters_, gfx::Vector2dF(1, 2), gfx::PointF(), |
+ background_filters_); |
ProcessForOverlays(); |
EXPECT_EQ(1U, ca_layer_list_.size()); |
} |
@@ -1806,7 +1809,8 @@ TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadBlurFilterScale) { |
filters_.Append(FilterOperation::CreateBlurFilter(0.8f)); |
quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), |
- filters_, gfx::Vector2dF(1, 2), background_filters_); |
+ filters_, gfx::Vector2dF(1, 2), gfx::PointF(), |
+ background_filters_); |
ProcessForOverlays(); |
EXPECT_EQ(1U, ca_layer_list_.size()); |
} |
@@ -1816,7 +1820,8 @@ TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadDropShadowFilterScale) { |
1.0f, SK_ColorGREEN)); |
quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), |
- filters_, gfx::Vector2dF(1, 2), background_filters_); |
+ filters_, gfx::Vector2dF(1, 2), gfx::PointF(), |
+ background_filters_); |
ProcessForOverlays(); |
EXPECT_EQ(1U, ca_layer_list_.size()); |
} |
@@ -1825,7 +1830,8 @@ TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadBackgroundFilter) { |
background_filters_.Append(FilterOperation::CreateGrayscaleFilter(0.1f)); |
quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), |
- filters_, gfx::Vector2dF(1, 1), background_filters_); |
+ filters_, gfx::Vector2dF(1, 1), gfx::PointF(), |
+ background_filters_); |
ProcessForOverlays(); |
EXPECT_EQ(0U, ca_layer_list_.size()); |
} |
@@ -1833,7 +1839,8 @@ TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadBackgroundFilter) { |
TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadMask) { |
quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
kOverlayRect, render_pass_id_, 2, gfx::Vector2dF(), gfx::Size(), |
- filters_, gfx::Vector2dF(1, 1), background_filters_); |
+ filters_, gfx::Vector2dF(1, 1), gfx::PointF(), |
+ background_filters_); |
ProcessForOverlays(); |
EXPECT_EQ(1U, ca_layer_list_.size()); |
} |
@@ -1842,7 +1849,8 @@ TEST_F(CALayerOverlayRPDQTest, RenderPassDrawQuadUnsupportedFilter) { |
filters_.Append(FilterOperation::CreateZoomFilter(0.9f, 1)); |
quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), |
- filters_, gfx::Vector2dF(1, 1), background_filters_); |
+ filters_, gfx::Vector2dF(1, 1), gfx::PointF(), |
+ background_filters_); |
ProcessForOverlays(); |
EXPECT_EQ(0U, ca_layer_list_.size()); |
} |