aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/pipe/SkPipeFormat.h
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-10-04 10:06:20 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-10-04 20:09:34 +0000
commit1834242ec6e3cd62669227d394bc79e1cd66dcfb (patch)
treec956e75f272619b5901ca0beab31dbf4a50d9974 /src/pipe/SkPipeFormat.h
parent6942442ef7cc018ac136dd379ad6a30902a060e5 (diff)
Revert[4] "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit 2cbcd12281ee807214df094964c584c78932e10b. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2924 Change-Id: I0fa5c58af428f3da8565465d1219a34ef8417d9a Reviewed-on: https://skia-review.googlesource.com/2924 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/pipe/SkPipeFormat.h')
-rw-r--r--src/pipe/SkPipeFormat.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/pipe/SkPipeFormat.h b/src/pipe/SkPipeFormat.h
index 8f5c8282e4..9a1d30c7be 100644
--- a/src/pipe/SkPipeFormat.h
+++ b/src/pipe/SkPipeFormat.h
@@ -94,12 +94,11 @@ enum {
kTypeface_NonDef = 1 << 6,
kPathEffect_NonDef = 1 << 7,
kShader_NonDef = 1 << 8,
- kXfermode_NonDef = 1 << 9,
- kMaskFilter_NonDef = 1 << 10,
- kColorFilter_NonDef = 1 << 11,
- kRasterizer_NonDef = 1 << 12,
- kImageFilter_NonDef = 1 << 13,
- kDrawLooper_NonDef = 1 << 14,
+ kMaskFilter_NonDef = 1 << 9,
+ kColorFilter_NonDef = 1 << 10,
+ kRasterizer_NonDef = 1 << 11,
+ kImageFilter_NonDef = 1 << 12,
+ kDrawLooper_NonDef = 1 << 13,
};
enum {