Blend TextureLayer background-color at draw time.

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 333af3f7668acb9e36c39496d52f6060eff21642..65cf117fd34cf64d81bd32573fa1663146450934 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -459,13 +459,14 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
   bool flipped = true;
   CREATE_SHARED_STATE();
 
-  CREATE_QUAD_7_NEW(TextureDrawQuad,
+  CREATE_QUAD_8_NEW(TextureDrawQuad,
                     opaque_rect,
                     resource_id,
                     premultiplied_alpha,
                     uv_top_left,
                     uv_bottom_right,
                     vertex_opacity,
+                    SK_ColorTRANSPARENT,
                     flipped);
   EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
   EXPECT_RECT_EQ(opaque_rect, copy_quad->opaque_rect);
@@ -476,12 +477,13 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
   EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
   EXPECT_EQ(flipped, copy_quad->flipped);
 
-  CREATE_QUAD_6_ALL(TextureDrawQuad,
+  CREATE_QUAD_7_ALL(TextureDrawQuad,
                     resource_id,
                     premultiplied_alpha,
                     uv_top_left,
                     uv_bottom_right,
                     vertex_opacity,
+                    SK_ColorTRANSPARENT,
                     flipped);
   EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
   EXPECT_EQ(resource_id, copy_quad->resource_id);
@@ -521,20 +523,22 @@ TEST(DrawQuadTest, ClipTextureDrawQuad) {
   // This the vertex opacity for the vertices 'ABCD'.
   const float vertex_opacity[] = { 0.3f, 0.4f, 0.7f, 0.8f };
   {
-    CREATE_QUAD_7_NEW(TextureDrawQuad,
+    CREATE_QUAD_8_NEW(TextureDrawQuad,
                       opaque_rect,
                       resource_id,
                       premultiplied_alpha,
                       uv_top_left,
                       uv_bottom_right,
                       vertex_opacity,
+                      SK_ColorTRANSPARENT,
                       flipped);
-    CREATE_QUAD_6_ALL(TextureDrawQuad,
+    CREATE_QUAD_7_ALL(TextureDrawQuad,
                       resource_id,
                       premultiplied_alpha,
                       uv_top_left,
                       uv_bottom_right,
                       vertex_opacity,
+                      SK_ColorTRANSPARENT,
                       flipped);
     EXPECT_TRUE(quad_all->PerformClipping());
 
@@ -557,20 +561,22 @@ TEST(DrawQuadTest, ClipTextureDrawQuad) {
   uv_top_left = gfx::PointF(0.8f, 0.7f);
   uv_bottom_right = gfx::PointF(0.2f, 0.1f);
   {
-    CREATE_QUAD_7_NEW(TextureDrawQuad,
+    CREATE_QUAD_8_NEW(TextureDrawQuad,
                       opaque_rect,
                       resource_id,
                       premultiplied_alpha,
                       uv_top_left,
                       uv_bottom_right,
                       vertex_opacity,
+                      SK_ColorTRANSPARENT,
                       flipped);
-    CREATE_QUAD_6_ALL(TextureDrawQuad,
+    CREATE_QUAD_7_ALL(TextureDrawQuad,
                       resource_id,
                       premultiplied_alpha,
                       uv_top_left,
                       uv_bottom_right,
                       vertex_opacity,
+                      SK_ColorTRANSPARENT,
                       flipped);
     EXPECT_TRUE(quad_all->PerformClipping());
 
@@ -821,13 +827,14 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
   bool flipped = true;
 
   CREATE_SHARED_STATE();
-  CREATE_QUAD_7_NEW(TextureDrawQuad,
+  CREATE_QUAD_8_NEW(TextureDrawQuad,
                     opaque_rect,
                     resource_id,
                     premultiplied_alpha,
                     uv_top_left,
                     uv_bottom_right,
                     vertex_opacity,
+                    SK_ColorTRANSPARENT,
                     flipped);
   EXPECT_EQ(resource_id, quad_new->resource_id);
   EXPECT_EQ(1, IterateAndCount(quad_new.get()));