aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-09-30 20:57:05 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-09-30 20:57:05 +0000
commit3253898f72eee660ae63fee92c72b773ac6cd092 (patch)
treef0e64e24b17a36e78b432d377275e8612665c4cb /include/core
parent600b3f658ce41f064bddd25ef06be0d6f208512a (diff)
need these for the forceaa change
git-svn-id: http://skia.googlecode.com/svn/trunk@2391 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkPaint.h8
-rw-r--r--include/core/SkScalerContext.h3
2 files changed, 9 insertions, 2 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index e2b3be7645..7f3f0be223 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -98,10 +98,14 @@ public:
kLCDRenderText_Flag = 0x200, //!< mask to enable subpixel glyph renderering
kEmbeddedBitmapText_Flag = 0x400, //!< mask to enable embedded bitmap strikes
kAutoHinting_Flag = 0x800, //!< mask to force Freetype's autohinter
+
+ // experimental/private
+ kForceAAText_Flag = 0x1000,
+
// when adding extra flags, note that the fFlags member is specified
// with a bit-width and you'll have to expand it.
- kAllFlags = 0xFFF
+ kAllFlags = 0x1FFF
};
/** Return the paint's flags. Use the Flag enum to test flag values.
@@ -834,7 +838,7 @@ private:
SkColor fColor;
SkScalar fWidth;
SkScalar fMiterLimit;
- unsigned fFlags : 12;
+ unsigned fFlags : 13;
unsigned fTextAlign : 2;
unsigned fCapType : 2;
unsigned fJoinType : 2;
diff --git a/include/core/SkScalerContext.h b/include/core/SkScalerContext.h
index b321289049..71826e8b45 100644
--- a/include/core/SkScalerContext.h
+++ b/include/core/SkScalerContext.h
@@ -175,6 +175,9 @@ public:
// these should only ever be set if fMaskFormat is LCD16 or LCD32
kLCD_Vertical_Flag = 0x400, // else Horizontal
kLCD_BGROrder_Flag = 0x800, // else RGB order
+
+ // experimental
+ kForceAA_Flag = 0x1000
};
private:
enum {