| Index: cc/quads/shared_quad_state.cc
|
| diff --git a/cc/quads/shared_quad_state.cc b/cc/quads/shared_quad_state.cc
|
| index 444d3300bed1b9d154680131ffa632ac8992b5c7..51d18be60103cd510a6be88cf570767f61a66afb 100644
|
| --- a/cc/quads/shared_quad_state.cc
|
| +++ b/cc/quads/shared_quad_state.cc
|
| @@ -11,7 +11,11 @@
|
| namespace cc {
|
|
|
| SharedQuadState::SharedQuadState()
|
| - : is_clipped(false), opacity(0.f), blend_mode(SkXfermode::kSrcOver_Mode) {}
|
| + : is_clipped(false),
|
| + opacity(0.f),
|
| + blend_mode(SkXfermode::kSrcOver_Mode),
|
| + context_id(0) {
|
| +}
|
|
|
| SharedQuadState::~SharedQuadState() {
|
| TRACE_EVENT_OBJECT_DELETED_WITH_ID(
|
| @@ -29,7 +33,8 @@ void SharedQuadState::SetAll(const gfx::Transform& content_to_target_transform,
|
| const gfx::Rect& clip_rect,
|
| bool is_clipped,
|
| float opacity,
|
| - SkXfermode::Mode blend_mode) {
|
| + SkXfermode::Mode blend_mode,
|
| + int context_id) {
|
| this->content_to_target_transform = content_to_target_transform;
|
| this->content_bounds = content_bounds;
|
| this->visible_content_rect = visible_content_rect;
|
| @@ -37,6 +42,7 @@ void SharedQuadState::SetAll(const gfx::Transform& content_to_target_transform,
|
| this->is_clipped = is_clipped;
|
| this->opacity = opacity;
|
| this->blend_mode = blend_mode;
|
| + this->context_id = context_id;
|
| }
|
|
|
| scoped_ptr<base::Value> SharedQuadState::AsValue() const {
|
|
|