aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-08-22 20:09:13 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-08-22 20:09:13 +0000
commitddc75dc216c36acce70aceb293b9b0a0257c2f21 (patch)
tree48b5a435ce35b88fbe92df974218bc12d081c02a /src
parent6b66c398f998418a001d664dce54f502c1d5e167 (diff)
Allow the y-baseline to float except when text is horizontal, as we were already
doing for the gpu case. Note: drawPosText was already behaving this way, this change just brings drawText into line with drawPosText. git-svn-id: http://skia.googlecode.com/svn/trunk@2152 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/core/SkDraw.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index d4f08580b0..10acf07e34 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1540,13 +1540,11 @@ void SkDraw::drawText(const char text[], size_t byteLength,
SkDrawCacheProc glyphCacheProc = paint.getDrawCacheProc();
const SkMatrix* matrix = fMatrix;
- SkFixed finalFYMask = ~0xFFFF; // trunc fy;
if (hasCustomD1GProc(*this)) {
// only support the fMVMatrix (for now) for the GPU case, which also
// sets the fD1GProc
if (fMVMatrix) {
matrix = fMVMatrix;
- finalFYMask = ~0; // don't truncate
}
}
@@ -1596,7 +1594,6 @@ void SkDraw::drawText(const char text[], size_t byteLength,
// apply the bias here, so we don't have to add 1/2 in the loop
fx += SK_FixedHalf;
fy += SK_FixedHalf;
- fyMask &= finalFYMask;
SkAutoBlitterChoose blitter;
if (needsRasterTextBlit(*this)) {