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

Unified Diff: include/effects/SkLayerDrawLooper.h

Issue 180483004: remove SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS -- not needed (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 10 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
« no previous file with comments | « no previous file | src/effects/SkLayerDrawLooper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkLayerDrawLooper.h
diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h
index c3ab24160770418bc45b537833f4ac1587144ae6..5bb2000f2da6b7cc3a7b1c59f86f5b653e4d7ef3 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 are always computed using the LayerInfo's fColorMode.
scroggo 2014/02/28 15:00:12 nit: Color is*
reed1 2014/02/28 15:37:53 Done.
*/
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;
« no previous file with comments | « no previous file | src/effects/SkLayerDrawLooper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698