Implement HiDPI and pinch-zoom scaling of filter params

cc/quads/draw_quad_unittest.cc

Index: cc/quads/draw_quad_unittest.cc
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index bf61b4b701a186a446a94f7c8c227af923923cdf..7134ce3e95208da9c87ed593766f4c4c0ad253a2 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -381,6 +381,14 @@ void CompareDrawQuad(DrawQuad* quad,
   }                                                              \
   SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
 
+#define CREATE_QUAD_9_NEW_RP(Type, a, b, c, d, e, f, g, h, i, copy_a) \

[danakj, 2014/08/05 14:05:43]

You can delete the old unused macros that these replace.

[garykac, 2014/08/05 21:17:49]

Done.

+  Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>();      \
+  {                                                                   \
+    QUAD_DATA quad_new->SetNew(                                       \
+        shared_state, quad_rect, a, b, c, d, e, f, g, h, i);          \
+  }                                                                   \
+  SETUP_AND_COPY_QUAD_NEW_RP(Type, quad_new, copy_a);
+
 #define CREATE_QUAD_9_ALL(Type, a, b, c, d, e, f, g, h, i) \
   {                                                        \
     QUAD_DATA quad_all->SetAll(shared_state,               \
@@ -470,6 +478,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
   FilterOperations filters;
   filters.Append(FilterOperation::CreateBlurFilter(1.f));
+  gfx::Vector2dF filters_scale;
   FilterOperations background_filters;
   background_filters.Append(
       FilterOperation::CreateGrayscaleFilter(1.f));
@@ -477,7 +486,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   RenderPass::Id copied_render_pass_id(235, 11);
   CREATE_SHARED_STATE();
 
-  CREATE_QUAD_8_NEW_RP(RenderPassDrawQuad,
+  CREATE_QUAD_9_NEW_RP(RenderPassDrawQuad,
                        visible_rect,
                        render_pass_id,
                        is_replica,
@@ -485,6 +494,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
                        contents_changed_since_last_frame,
                        mask_u_v_rect,
                        filters,
+                       filters_scale,
                        background_filters,
                        copied_render_pass_id);
   EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
@@ -498,13 +508,14 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   EXPECT_EQ(filters, copy_quad->filters);
   EXPECT_EQ(background_filters, copy_quad->background_filters);
 
-  CREATE_QUAD_7_ALL_RP(RenderPassDrawQuad,
+  CREATE_QUAD_8_ALL_RP(RenderPassDrawQuad,
                        render_pass_id,
                        is_replica,
                        mask_resource_id,
                        contents_changed_since_last_frame,
                        mask_u_v_rect,
                        filters,
+                       filters_scale,
                        background_filters,
                        copied_render_pass_id);
   EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
@@ -823,7 +834,7 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
   RenderPass::Id copied_render_pass_id(235, 11);
 
   CREATE_SHARED_STATE();
-  CREATE_QUAD_8_NEW_RP(RenderPassDrawQuad,
+  CREATE_QUAD_9_NEW_RP(RenderPassDrawQuad,
                        visible_rect,
                        render_pass_id,
                        is_replica,
@@ -831,6 +842,7 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
                        contents_changed_since_last_frame,
                        mask_u_v_rect,
                        filters,
+                       gfx::Vector2dF(),
                        background_filters,
                        copied_render_pass_id);
   EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id);