Blend TextureLayer background-color at draw time.

cc/quads/texture_draw_quad.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/texture_draw_quad.h"
 
 #include "base/logging.h"
 #include "ui/gfx/vector2d_f.h"
 
 namespace cc {
 
 TextureDrawQuad::TextureDrawQuad()
     : resource_id(0),
       premultiplied_alpha(false),
+      background_color(SK_ColorTRANSPARENT),
       flipped(false) {
   this->vertex_opacity[0] = 0.f;
   this->vertex_opacity[1] = 0.f;
   this->vertex_opacity[2] = 0.f;
   this->vertex_opacity[3] = 0.f;
 }
 
 scoped_ptr<TextureDrawQuad> TextureDrawQuad::Create() {
   return make_scoped_ptr(new TextureDrawQuad);
 }
 
 void TextureDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
                              gfx::Rect rect, gfx::Rect opaque_rect,
                              unsigned resource_id, bool premultiplied_alpha,
                              gfx::PointF uv_top_left,
                              gfx::PointF uv_bottom_right,
-                             const float vertex_opacity[4], bool flipped) {
+                             SkColor background_color,
+                             const float vertex_opacity[4],
+                             bool flipped) {
   gfx::Rect visible_rect = rect;
   bool needs_blending = vertex_opacity[0] != 1.0f || vertex_opacity[1] != 1.0f
       || vertex_opacity[2] != 1.0f || vertex_opacity[3] != 1.0f;
   DrawQuad::SetAll(shared_quad_state, DrawQuad::TEXTURE_CONTENT, rect,
                    opaque_rect, visible_rect, needs_blending);
   this->resource_id = resource_id;
   this->premultiplied_alpha = premultiplied_alpha;
   this->uv_top_left = uv_top_left;
   this->uv_bottom_right = uv_bottom_right;
+  this->background_color = background_color;
   this->vertex_opacity[0] = vertex_opacity[0];
   this->vertex_opacity[1] = vertex_opacity[1];
   this->vertex_opacity[2] = vertex_opacity[2];
   this->vertex_opacity[3] = vertex_opacity[3];
   this->flipped = flipped;
 }
 
 void TextureDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
                              gfx::Rect rect, gfx::Rect opaque_rect,
                              gfx::Rect visible_rect, bool needs_blending,
                              unsigned resource_id, bool premultiplied_alpha,
                              gfx::PointF uv_top_left,
                              gfx::PointF uv_bottom_right,
-                             const float vertex_opacity[4], bool flipped) {
+                             SkColor background_color,
+                             const float vertex_opacity[4],
+                             bool flipped) {
   DrawQuad::SetAll(shared_quad_state, DrawQuad::TEXTURE_CONTENT, rect,
                    opaque_rect, visible_rect, needs_blending);
   this->resource_id = resource_id;
   this->premultiplied_alpha = premultiplied_alpha;
   this->uv_top_left = uv_top_left;
   this->uv_bottom_right = uv_bottom_right;
+  this->background_color = background_color;
   this->vertex_opacity[0] = vertex_opacity[0];
   this->vertex_opacity[1] = vertex_opacity[1];
   this->vertex_opacity[2] = vertex_opacity[2];
   this->vertex_opacity[3] = vertex_opacity[3];
   this->flipped = flipped;
 }
 
 void TextureDrawQuad::IterateResources(
     const ResourceIteratorCallback& callback) {
   resource_id = callback.Run(resource_id);
@@ skipping 72 matching lines @@
   clipped_rect -= offset;
   clipped_rect.Scale(1.0f / x_scale, 1.0f / y_scale);
   rect = gfx::Rect(static_cast<int>(clipped_rect.x() + 0.5f),
                    static_cast<int>(clipped_rect.y() + 0.5f),
                    static_cast<int>(clipped_rect.width() + 0.5f),
                    static_cast<int>(clipped_rect.height() + 0.5f));
   return true;
 }
 
 }  // namespace cc