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

Unified Diff: cc/output/gl_renderer_draw_cache.h

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/output/gl_renderer.cc ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer_draw_cache.h
diff --git a/cc/output/gl_renderer_draw_cache.h b/cc/output/gl_renderer_draw_cache.h
index 85369ef0ac5e5cf5165669bbb2d305a19b2aace8..f8284184f0c0771a61f61fedb6d26799582b3f99 100644
--- a/cc/output/gl_renderer_draw_cache.h
+++ b/cc/output/gl_renderer_draw_cache.h
@@ -8,6 +8,7 @@
#include <vector>
#include "base/basictypes.h"
+#include "third_party/skia/include/core/SkColor.h"
namespace cc {
@@ -32,9 +33,11 @@ struct TexturedQuadDrawCache {
int program_id;
int resource_id;
bool needs_blending;
+ SkColor background_color;
// Information about the program binding that is required to draw.
int uv_xform_location;
+ int background_color_location;
int vertex_opacity_location;
int matrix_location;
int sampler_location;
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698