Added support for non-separable blending modes.
Fixed scalar issue from https://codereview.appspot.com/7346044
Review URL: https://chromiumcodereview.appspot.com/12393049
git-svn-id: http://skia.googlecode.com/svn/trunk/include@7984 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core/SkXfermode.h b/core/SkXfermode.h
index 27a6bf3..54946fd 100644
--- a/core/SkXfermode.h
+++ b/core/SkXfermode.h
@@ -99,15 +99,14 @@
kSrcATop_Mode, //!< [Da, Sc * Da + (1 - Sa) * Dc]
kDstATop_Mode, //!< [Sa, Sa * Dc + Sc * (1 - Da)]
kXor_Mode, //!< [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + (1 - Sa) * Dc]
-
- // all remaining modes are defined in the SVG Compositing standard
- // http://www.w3.org/TR/2009/WD-SVGCompositing-20090430/
- kPlus_Mode,
+ kPlus_Mode, //!< [Sa + Da, Sc + Dc]
kModulate_Mode, // multiplies all components (= alpha and color)
// all above modes can be expressed as pair of src/dst Coeffs
kCoeffModesCnt,
+ // Following blend modes are defined in the CSS Compositing standard:
+ // https://dvcs.w3.org/hg/FXTF/rawfile/tip/compositing/index.html#blending
kScreen_Mode = kCoeffModesCnt,
kOverlay_Mode,
kDarken_Mode,
@@ -120,7 +119,12 @@
kExclusion_Mode,
kMultiply_Mode,
- kLastMode = kMultiply_Mode
+ kHue_Mode,
+ kSaturation_Mode,
+ kColor_Mode,
+ kLuminosity_Mode,
+
+ kLastMode = kLuminosity_Mode
};
/**
