aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2012-05-16 14:20:20 -0400
committerDerek Sollenberger <djsollen@google.com>2012-05-16 14:20:20 -0400
commit17e8e7f090bf84986b3fc2c9822daa83c8719ecc (patch)
tree694de76cac6d1163034f7201a14c813cfe6763d0 /src
parent41b64c065a09cf5957f2929e471d04fc7ca9656f (diff)
downloadexternal_skia-17e8e7f090bf84986b3fc2c9822daa83c8719ecc.zip
external_skia-17e8e7f090bf84986b3fc2c9822daa83c8719ecc.tar.gz
external_skia-17e8e7f090bf84986b3fc2c9822daa83c8719ecc.tar.bz2
Disable the incorrect culling of vertical text.
bug:6242553 Change-Id: Ied1865b667c21d0a59586ec8b36db276f892ccbc
Diffstat (limited to 'src')
-rw-r--r--src/core/SkPictureRecord.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index ba49b72..fdeec3f 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -319,7 +319,7 @@ void SkPictureRecord::addFontMetricsTopBottom(const SkPaint& paint,
void SkPictureRecord::drawText(const void* text, size_t byteLength, SkScalar x,
SkScalar y, const SkPaint& paint) {
- bool fast = paint.canComputeFastBounds();
+ bool fast = !paint.isVerticalText() && paint.canComputeFastBounds();
addDraw(fast ? DRAW_TEXT_TOP_BOTTOM : DRAW_TEXT);
addPaint(paint);
@@ -356,7 +356,7 @@ void SkPictureRecord::drawPosText(const void* text, size_t byteLength,
}
}
- bool fastBounds = paint.canComputeFastBounds();
+ bool fastBounds = !paint.isVerticalText() && paint.canComputeFastBounds();
bool fast = canUseDrawH && fastBounds;
if (fast) {
@@ -404,7 +404,7 @@ void SkPictureRecord::drawPosTextH(const void* text, size_t byteLength,
if (0 == points)
return;
- bool fast = paint.canComputeFastBounds();
+ bool fast = !paint.isVerticalText() && paint.canComputeFastBounds();
addDraw(fast ? DRAW_POS_TEXT_H_TOP_BOTTOM : DRAW_POS_TEXT_H);
addPaint(paint);