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

Unified Diff: cc/quads/shared_quad_state.cc

Issue 23455060: mix-blend-mode implementation for accelerated layers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moving blend_mode property to SharedQuadState Created 7 years, 3 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/quads/shared_quad_state.cc
diff --git a/cc/quads/shared_quad_state.cc b/cc/quads/shared_quad_state.cc
index 6a53d9f6a9f8d1a410deacb6ae8fc44d745d28ed..6d9daa8b216484b1cae967a3e7c69e486b4a4338 100644
--- a/cc/quads/shared_quad_state.cc
+++ b/cc/quads/shared_quad_state.cc
@@ -10,7 +10,9 @@
namespace cc {
-SharedQuadState::SharedQuadState() : is_clipped(false), opacity(0.f) {}
+SharedQuadState::SharedQuadState() : is_clipped(false),
+ opacity(0.f),
+ blend_mode(SkXfermode::kSrcOver_Mode) {}
SharedQuadState::~SharedQuadState() {
TRACE_EVENT_OBJECT_DELETED_WITH_ID(
@@ -32,13 +34,15 @@ void SharedQuadState::SetAll(
gfx::Rect visible_content_rect,
gfx::Rect clip_rect,
bool is_clipped,
- float opacity) {
+ float opacity,
+ SkXfermode::Mode blend_mode) {
this->content_to_target_transform = content_to_target_transform;
this->content_bounds = content_bounds;
this->visible_content_rect = visible_content_rect;
this->clip_rect = clip_rect;
this->is_clipped = is_clipped;
this->opacity = opacity;
+ this->blend_mode = blend_mode;
}
scoped_ptr<base::Value> SharedQuadState::AsValue() const {
@@ -52,6 +56,7 @@ scoped_ptr<base::Value> SharedQuadState::AsValue() const {
value->SetBoolean("is_clipped", is_clipped);
value->Set("clip_rect", MathUtil::AsValue(clip_rect).release());
value->SetDouble("opacity", opacity);
+ value->SetInteger("blend_mode", blend_mode);
enne (OOO) 2013/09/26 16:25:13 This should probably be a string to make it readab
rosca 2013/09/27 10:39:06 Done.
TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"),
value.get(), "cc::SharedQuadState", this);

Powered by Google App Engine
This is Rietveld 408576698