Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1034)

Unified Diff: cc/layers/nine_patch_layer_impl.cc

Issue 18432002: Blend TextureLayer background-color at draw time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added TextureLayer unittest Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/layers/nine_patch_layer_impl.cc
diff --git a/cc/layers/nine_patch_layer_impl.cc b/cc/layers/nine_patch_layer_impl.cc
index 57723a02108fc7c0ac17cc2274cfeac8dbdb13cd..4afb7bbeabe91876bf9e03ef52c4c291d9adb2d8 100644
--- a/cc/layers/nine_patch_layer_impl.cc
+++ b/cc/layers/nine_patch_layer_impl.cc
@@ -179,7 +179,9 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
premultiplied_alpha,
uv_top_left.origin(),
uv_top_left.bottom_right(),
- vertex_opacity, flipped);
+ vertex_opacity,
+ SK_ColorTRANSPARENT,
+ flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
quad = TextureDrawQuad::Create();
@@ -190,7 +192,9 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
premultiplied_alpha,
uv_top_right.origin(),
uv_top_right.bottom_right(),
- vertex_opacity, flipped);
+ vertex_opacity,
+ SK_ColorTRANSPARENT,
+ flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
quad = TextureDrawQuad::Create();
@@ -202,6 +206,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
uv_bottom_left.origin(),
uv_bottom_left.bottom_right(),
vertex_opacity,
+ SK_ColorTRANSPARENT,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -214,6 +219,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
uv_bottom_right.origin(),
uv_bottom_right.bottom_right(),
vertex_opacity,
+ SK_ColorTRANSPARENT,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -226,6 +232,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
uv_top.origin(),
uv_top.bottom_right(),
vertex_opacity,
+ SK_ColorTRANSPARENT,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -238,6 +245,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
uv_left.origin(),
uv_left.bottom_right(),
vertex_opacity,
+ SK_ColorTRANSPARENT,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -250,6 +258,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
uv_right.origin(),
uv_right.bottom_right(),
vertex_opacity,
+ SK_ColorTRANSPARENT,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -262,6 +271,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
uv_bottom.origin(),
uv_bottom.bottom_right(),
vertex_opacity,
+ SK_ColorTRANSPARENT,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
}

Powered by Google App Engine
This is Rietveld 408576698