Implement HiDPI and pinch-zoom scaling of filter params

This change implements HiDPI scaling of filter params in CC. It also fixes content scaling of filter params (e.g.,
with -webkit-transform: scale(X)) as well as pinch-zoom scaling.

This code is mostly from http://crrev.com/191123002
   "Implement hidpi and pinch-zoom scaling of filter params in cc"
and replaces http://crrev.com/317663005
   "Scale the ALPHA_THRESHOLD filter's region based on the device scale factor"
because this fixes all filters rather than just the AlphaThresholdFilter.

BUG=376532, 281516, 281518, 349493
R=brettw@chromium.org, danakj@chromium.org, enne@chromium.org, jschuh@chromium.org

Review URL: https://codereview.chromium.org/394193003

Cr-Commit-Position: refs/heads/master@{#288436}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288436 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 11 deletions

diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index bf61b4b..fdcf254 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -346,14 +346,6 @@ void CompareDrawQuad(DrawQuad* quad,
   }                                                              \
   SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
 
-#define CREATE_QUAD_8_NEW_RP(Type, a, b, c, d, e, f, g, h, copy_a) \
-  Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>();   \
-  {                                                                \
-    QUAD_DATA quad_new->SetNew(                                    \
-        shared_state, quad_rect, a, b, c, d, e, f, g, h);          \
-  }                                                                \
-  SETUP_AND_COPY_QUAD_NEW_RP(Type, quad_new, copy_a);
-
 #define CREATE_QUAD_8_ALL_RP(Type, a, b, c, d, e, f, g, h, copy_a) \
   Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>();   \
   {                                                                \
@@ -381,6 +373,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) \
+  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 +470,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 +478,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 +486,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 +500,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 +826,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 +834,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);