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

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: resolved conflicts with TOT Created 7 years, 5 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
« no previous file with comments | « cc/layers/heads_up_display_layer_impl.cc ('k') | cc/layers/scrollbar_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..103f7656eb85c5ad24212f680306ce1ed9e4b507 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);
+ SK_ColorTRANSPARENT,
+ vertex_opacity,
+ 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);
+ SK_ColorTRANSPARENT,
+ vertex_opacity,
+ flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
quad = TextureDrawQuad::Create();
@@ -201,6 +205,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
premultiplied_alpha,
uv_bottom_left.origin(),
uv_bottom_left.bottom_right(),
+ SK_ColorTRANSPARENT,
vertex_opacity,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -213,6 +218,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
premultiplied_alpha,
uv_bottom_right.origin(),
uv_bottom_right.bottom_right(),
+ SK_ColorTRANSPARENT,
vertex_opacity,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -225,6 +231,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
premultiplied_alpha,
uv_top.origin(),
uv_top.bottom_right(),
+ SK_ColorTRANSPARENT,
vertex_opacity,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -237,6 +244,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
premultiplied_alpha,
uv_left.origin(),
uv_left.bottom_right(),
+ SK_ColorTRANSPARENT,
vertex_opacity,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -249,6 +257,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
premultiplied_alpha,
uv_right.origin(),
uv_right.bottom_right(),
+ SK_ColorTRANSPARENT,
vertex_opacity,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
@@ -261,6 +270,7 @@ void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
premultiplied_alpha,
uv_bottom.origin(),
uv_bottom.bottom_right(),
+ SK_ColorTRANSPARENT,
vertex_opacity,
flipped);
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
« no previous file with comments | « cc/layers/heads_up_display_layer_impl.cc ('k') | cc/layers/scrollbar_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698