| 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 493ae4ca2a25dee3569a7c668e8920c60446a0f9..a2e43f25b8f210cb6e1fcadcafee84fce3fbea4f 100644
|
| --- a/cc/output/gl_renderer_draw_cache.h
|
| +++ b/cc/output/gl_renderer_draw_cache.h
|
| @@ -8,12 +8,11 @@
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| +#include "cc/output/program_binding.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
|
|
| namespace cc {
|
|
|
| -class Program;
|
| -
|
| // Collects 4 floats at a time for easy upload to GL.
|
| struct Float4 {
|
| float data[4];
|
| @@ -31,8 +30,10 @@ struct TexturedQuadDrawCache {
|
| TexturedQuadDrawCache();
|
| ~TexturedQuadDrawCache();
|
|
|
| + bool is_empty = true;
|
| +
|
| // Values tracked to determine if textured quads may be coalesced.
|
| - const Program* program = nullptr;
|
| + ProgramKey program_key;
|
| int resource_id = -1;
|
| bool needs_blending = false;
|
| bool nearest_neighbor = false;
|
|
|