cc: Support anti-aliasing for solid color layers.

cc/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/draw_quad.h"
 
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/math_util.h"
@@ skipping 311 matching lines @@
     EXPECT_EQ(filters, copyQuad->filters);
     EXPECT_EQ(filter, copyQuad->filter);
     EXPECT_EQ(background_filters, copyQuad->background_filters);
 }
 
 TEST(DrawQuadTest, copySolidColorDrawQuad)
 {
     SkColor color = 0x49494949;
     CREATE_SHARED_STATE();
 
-    CREATE_QUAD_1_NEW(SolidColorDrawQuad, color);
+    CREATE_QUAD_2_NEW(SolidColorDrawQuad, DrawQuad::AntiAliasing(), color);
     EXPECT_EQ(DrawQuad::SOLID_COLOR, copyQuad->material);
     EXPECT_EQ(color, copyQuad->color);
 
-    CREATE_QUAD_1_ALL(SolidColorDrawQuad, color);
+    CREATE_QUAD_2_ALL(SolidColorDrawQuad, DrawQuad::AntiAliasing(), color);
     EXPECT_EQ(DrawQuad::SOLID_COLOR, copyQuad->material);
     EXPECT_EQ(color, copyQuad->color);
 }
 
 TEST(DrawQuadTest, copyStreamVideoDrawQuad)
 {
     gfx::Rect opaqueRect(3, 7, 10, 12);
     unsigned textureId = 64;
     gfx::Transform matrix = MathUtil::createGfxTransform(0.5, 1, 0.25, 0.75, 0, 1);
     CREATE_SHARED_STATE();
@@ skipping 44 matching lines @@
     unsigned resourceId = 104;
     gfx::RectF texCoordRect(31, 12, 54, 20);
     gfx::Size textureSize(85, 32);
     bool swizzleContents = true;
     bool leftEdgeAA = true;
     bool topEdgeAA = true;
     bool rightEdgeAA = false;
     bool bottomEdgeAA = true;
     CREATE_SHARED_STATE();
 
-    CREATE_QUAD_9_NEW(TileDrawQuad, opaqueRect, resourceId, texCoordRect, textureSize, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA);
+    CREATE_QUAD_6_NEW(TileDrawQuad, opaqueRect, DrawQuad::AntiAliasing(leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA), resourceId, texCoordRect, textureSize, swizzleContents);
     EXPECT_EQ(DrawQuad::TILED_CONTENT, copyQuad->material);
     EXPECT_RECT_EQ(opaqueRect, copyQuad->opaque_rect);
     EXPECT_EQ(resourceId, copyQuad->resource_id);
     EXPECT_EQ(texCoordRect, copyQuad->tex_coord_rect);
     EXPECT_EQ(textureSize, copyQuad->texture_size);
     EXPECT_EQ(swizzleContents, copyQuad->swizzle_contents);
-    EXPECT_EQ(leftEdgeAA, copyQuad->left_edge_aa);
-    EXPECT_EQ(topEdgeAA, copyQuad->top_edge_aa);
-    EXPECT_EQ(rightEdgeAA, copyQuad->right_edge_aa);
-    EXPECT_EQ(bottomEdgeAA, copyQuad->bottom_edge_aa);
+    EXPECT_EQ(leftEdgeAA, copyQuad->anti_aliasing.left_edge);
+    EXPECT_EQ(topEdgeAA, copyQuad->anti_aliasing.top_edge);
+    EXPECT_EQ(rightEdgeAA, copyQuad->anti_aliasing.right_edge);
+    EXPECT_EQ(bottomEdgeAA, copyQuad->anti_aliasing.bottom_edge);
 
-    CREATE_QUAD_8_ALL(TileDrawQuad, resourceId, texCoordRect, textureSize, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA);
+    CREATE_QUAD_5_ALL(TileDrawQuad, DrawQuad::AntiAliasing(leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA), resourceId, texCoordRect, textureSize, swizzleContents);
     EXPECT_EQ(DrawQuad::TILED_CONTENT, copyQuad->material);
     EXPECT_EQ(resourceId, copyQuad->resource_id);
     EXPECT_EQ(texCoordRect, copyQuad->tex_coord_rect);
     EXPECT_EQ(textureSize, copyQuad->texture_size);
     EXPECT_EQ(swizzleContents, copyQuad->swizzle_contents);
-    EXPECT_EQ(leftEdgeAA, copyQuad->left_edge_aa);
-    EXPECT_EQ(topEdgeAA, copyQuad->top_edge_aa);
-    EXPECT_EQ(rightEdgeAA, copyQuad->right_edge_aa);
-    EXPECT_EQ(bottomEdgeAA, copyQuad->bottom_edge_aa);
+    EXPECT_EQ(leftEdgeAA, copyQuad->anti_aliasing.left_edge);
+    EXPECT_EQ(topEdgeAA, copyQuad->anti_aliasing.top_edge);
+    EXPECT_EQ(rightEdgeAA, copyQuad->anti_aliasing.right_edge);
+    EXPECT_EQ(bottomEdgeAA, copyQuad->anti_aliasing.bottom_edge);
 }
 
 TEST(DrawQuadTest, copyYUVVideoDrawQuad)
 {
     gfx::Rect opaqueRect(3, 7, 10, 12);
     gfx::SizeF texScale(0.75, 0.5);
     VideoLayerImpl::FramePlane yPlane;
     yPlane.resourceId = 45;
     yPlane.size = gfx::Size(34, 23);
     yPlane.format = 8;
@@ skipping 30 matching lines @@
     EXPECT_EQ(uPlane.resourceId, copyQuad->u_plane.resourceId);
     EXPECT_EQ(uPlane.size, copyQuad->u_plane.size);
     EXPECT_EQ(uPlane.format, copyQuad->u_plane.format);
     EXPECT_EQ(vPlane.resourceId, copyQuad->v_plane.resourceId);
     EXPECT_EQ(vPlane.size, copyQuad->v_plane.size);
     EXPECT_EQ(vPlane.format, copyQuad->v_plane.format);
 }
 
 }  // namespace
 }  // namespace cc