aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar agl@chromium.org <agl@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2010-01-04 23:56:43 +0000
committerGravatar agl@chromium.org <agl@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2010-01-04 23:56:43 +0000
commit13c8558e37043d4aad8b439ed053fac1cdb6763d (patch)
tree41b1bbaec43de28eb3816e82435e22b477bfb5d4 /include
parent474a12c4976b3000174cad5df74c498cd723c5e2 (diff)
Fix r466 which was causing Chromium valgrind failures.
See the added comment for details. TBR=reed (since it's a build fix) git-svn-id: http://skia.googlecode.com/svn/trunk@469 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkScalerContext.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/core/SkScalerContext.h b/include/core/SkScalerContext.h
index 05d25086f7..407985b3d8 100644
--- a/include/core/SkScalerContext.h
+++ b/include/core/SkScalerContext.h
@@ -154,6 +154,7 @@ public:
// up with the SkPaint::Hinting enum.
kHintingBit1_Flag = 0x10,
kHintingBit2_Flag = 0x20,
+ kEmbeddedBitmapText_Flag = 0x40,
};
private:
enum {
@@ -166,10 +167,13 @@ public:
SkScalar fPost2x2[2][2];
SkScalar fFrameWidth, fMiterLimit;
bool fSubpixelPositioning;
- bool fUseEmbeddedBitmapText;
uint8_t fMaskFormat;
uint8_t fStrokeJoin;
uint8_t fFlags;
+ // Warning: when adding members note that the size of this structure
+ // must be a multiple of 4. SkDescriptor requires that its arguments be
+ // multiples of four and this structure is put in an SkDescriptor in
+ // SkPaint::MakeRec.
void getMatrixFrom2x2(SkMatrix*) const;
void getLocalMatrix(SkMatrix*) const;