Implement HiDPI and pinch-zoom scaling of filter params

cc/quads/draw_quad_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/quads/draw_quad.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 363 matching lines @@
   SETUP_AND_COPY_QUAD_ALL_RP(Type, quad_all, copy_a);
 
 #define CREATE_QUAD_9_NEW(Type, a, b, c, d, e, f, g, h, i)       \
   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(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,               \
                                quad_rect,                  \
                                quad_opaque_rect,           \
                                quad_visible_rect,          \
                                needs_blending,             \
                                a,                          \
                                b,                          \
                                c,                          \
@@ skipping 69 matching lines @@
 
 TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   gfx::Rect visible_rect(40, 50, 30, 20);
   RenderPass::Id render_pass_id(22, 64);
   bool is_replica = true;
   ResourceProvider::ResourceId mask_resource_id = 78;
   gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24);
   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));
 
   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,
                        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);
   EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect);
   EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
   EXPECT_EQ(is_replica, copy_quad->is_replica);
   EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);
   EXPECT_RECT_EQ(contents_changed_since_last_frame,
                  copy_quad->contents_changed_since_last_frame);
   EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString());
   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);
   EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
   EXPECT_EQ(is_replica, copy_quad->is_replica);
   EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);
   EXPECT_RECT_EQ(contents_changed_since_last_frame,
                  copy_quad->contents_changed_since_last_frame);
   EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString());
   EXPECT_EQ(filters, copy_quad->filters);
@@ skipping 298 matching lines @@
   gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
   FilterOperations filters;
   filters.Append(FilterOperation::CreateBlurFilter(1.f));
   FilterOperations background_filters;
   background_filters.Append(
       FilterOperation::CreateGrayscaleFilter(1.f));
 
   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,
                        mask_resource_id,
                        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);
   EXPECT_EQ(1, IterateAndCount(quad_new));
   EXPECT_EQ(mask_resource_id + 1, quad_new->mask_resource_id);
   quad_new->mask_resource_id = 0;
   EXPECT_EQ(0, IterateAndCount(quad_new));
   EXPECT_EQ(0u, quad_new->mask_resource_id);
 }
 
@@ skipping 130 matching lines @@
                     texture_size,
                     texture_format,
                     content_rect,
                     contents_scale,
                     picture_pile);
   EXPECT_EQ(0, IterateAndCount(quad_new));
 }
 
 }  // namespace
 }  // namespace cc