aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
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 /src/core
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 'src/core')
-rw-r--r--src/core/SkPaint.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 589b1c711c..e4e4ea87f2 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -1223,7 +1223,8 @@ void SkScalerContext::MakeRec(const SkPaint& paint,
rec->fMaskFormat = SkToU8(computeMaskFormat(paint));
rec->fFlags = SkToU8(flags);
rec->setHinting(computeHinting(paint));
- rec->fUseEmbeddedBitmapText = paint.isEmbeddedBitmapText();
+ if (paint.isEmbeddedBitmapText())
+ rec->fFlags |= SkScalerContext::kEmbeddedBitmapText_Flag;
/* 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,