aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-05-18 21:14:39 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-05-18 21:14:39 +0000
commit9d7576724cf9602ff778b18126e0fef0ab3d3bf2 (patch)
treeb5111372375f33e82d3569b3f1a10c0b0392d64b /src/core
parent1f75399dced577f467608eadb05ff41de141e4c2 (diff)
setHinting modifies fFlags in places, so call it last (after initializing fFlags)
git-svn-id: http://skia.googlecode.com/svn/trunk@1372 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkPaint.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 311ec7d118..c023dbf206 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -1292,7 +1292,6 @@ void SkScalerContext::MakeRec(const SkPaint& paint,
rec->fStrokeJoin = 0;
}
- rec->setHinting(computeHinting(paint));
rec->fMaskFormat = SkToU8(computeMaskFormat(paint));
if (SkMask::kLCD16_Format == rec->fMaskFormat) {
@@ -1322,6 +1321,9 @@ void SkScalerContext::MakeRec(const SkPaint& paint,
}
rec->fFlags = SkToU16(flags);
+ // setHinting modifies fFlags, so do this last
+ rec->setHinting(computeHinting(paint));
+
/* Allow the fonthost to modify our rec before we use it as a key into the
cache. This way if we're asking for something that they will ignore,
they can modify our rec up front, so we don't create duplicate cache