aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects/SkLayerDrawLooper.h
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-28 15:38:22 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-28 15:38:22 +0000
commit842292f10fc08bc8701114f7eec00944b6ea26d2 (patch)
treef25703dd8032c356ac87b25f5bfcc23fcdbf4f43 /include/effects/SkLayerDrawLooper.h
parent03fc3b4f67a115e4a7945d173856a6c80b09311e (diff)
remove SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS -- not needed
BUG=skia: R=scroggo@google.com Review URL: https://codereview.chromium.org/180483004 git-svn-id: http://skia.googlecode.com/svn/trunk@13623 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects/SkLayerDrawLooper.h')
-rw-r--r--include/effects/SkLayerDrawLooper.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h
index c3ab241607..241b3b2494 100644
--- a/include/effects/SkLayerDrawLooper.h
+++ b/include/effects/SkLayerDrawLooper.h
@@ -24,8 +24,8 @@ public:
* Bits specifies which aspects of the layer's paint should replace the
* corresponding aspects on the draw's paint.
* kEntirePaint_Bits means use the layer's paint completely.
- * 0 means ignore the layer's paint... except that LayerInfo's fFlagsMask
- * and fColorMode are always applied.
+ * 0 means ignore the layer's paint... except for fColorMode, which is
+ * always applied.
*/
enum Bits {
kStyle_Bit = 1 << 0, //!< use this layer's Style/stroke settings
@@ -40,8 +40,7 @@ public:
* Use the layer's paint entirely, with these exceptions:
* - We never override the draw's paint's text_encoding, since that is
* used to interpret the text/len parameters in draw[Pos]Text.
- * - Flags and Color are always computed using the LayerInfo's
- * fFlagsMask and fColorMode.
+ * - Color is always computed using the LayerInfo's fColorMode.
*/
kEntirePaint_Bits = -1
@@ -51,12 +50,6 @@ public:
/**
* Info for how to apply the layer's paint and offset.
*
- * fFlagsMask selects which flags in the layer's paint should be applied.
- * result = (draw-flags & ~fFlagsMask) | (layer-flags & fFlagsMask)
- * In the extreme:
- * If fFlagsMask is 0, we ignore all of the layer's flags
- * If fFlagsMask is -1, we use all of the layer's flags
- *
* fColorMode controls how we compute the final color for the layer:
* The layer's paint's color is treated as the SRC
* The draw's paint's color is treated as the DST
@@ -66,9 +59,6 @@ public:
* kDst_Mode: to just keep the draw's color, ignoring the layer's
*/
struct SK_API LayerInfo {
-#ifdef SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS
- uint32_t fFlagsMask; // SkPaint::Flags
-#endif
BitFlags fPaintBits;
SkXfermode::Mode fColorMode;
SkVector fOffset;