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

Unified Diff: cc/quads/shared_quad_state.h

Issue 23455060: mix-blend-mode implementation for accelerated layers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added compositor_bindungs Created 7 years, 2 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.h
diff --git a/cc/quads/shared_quad_state.h b/cc/quads/shared_quad_state.h
index 79bd09b60f7e1ffb3603a4cb331af7da95ea76f6..52457ddddd55d4d7178e6e632ef17975735dafb3 100644
--- a/cc/quads/shared_quad_state.h
+++ b/cc/quads/shared_quad_state.h
@@ -7,6 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
+#include "third_party/skia/include/core/SkXfermode.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/transform.h"
@@ -28,7 +29,9 @@ class CC_EXPORT SharedQuadState {
gfx::Rect visible_content_rect,
gfx::Rect clip_rect,
bool is_clipped,
- float opacity);
+ float opacity,
+ // TODO(rosca): remove the default param after implementing tests
enne (OOO) 2013/10/11 18:14:35 No default parameters, please. Just fix up whatev
rosca 2013/10/16 14:54:47 Done.
+ SkXfermode::Mode blend_mode = SkXfermode::kSrcOver_Mode);
scoped_ptr<base::Value> AsValue() const;
// Transforms from quad's original content space to its target content space.
@@ -41,6 +44,7 @@ class CC_EXPORT SharedQuadState {
gfx::Rect clip_rect;
bool is_clipped;
float opacity;
+ SkXfermode::Mode blend_mode;
private:
SharedQuadState();

Powered by Google App Engine
This is Rietveld 408576698