diff options
author | fmalita <fmalita@chromium.org> | 2014-09-29 06:29:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 06:29:53 -0700 |
commit | 05c4a4322e7d4f3417b7df33825bab8603d52051 (patch) | |
tree | 79a22f660fe2b6b58bab4e9f8cc1c9f86f50d565 /src/core/SkTextMapStateProc.h | |
parent | ee6631ef90fb5a9c80de6eacd37632f11367a088 (diff) |
Revert of Revert of Fix SkTextBlob offset semantics. (patchset #1 id:1 of https://codereview.chromium.org/609223003/)
Reason for revert:
Re-landing: Chromium-side fix to be landed with the roll (https://codereview.chromium.org/607853003/)
Original issue's description:
> Revert of Fix SkTextBlob offset semantics. (patchset #2 id:20001 of https://codereview.chromium.org/605533002/)
>
> Reason for revert:
> Breaking the Chrome builds with the error:
>
> [14:54:14.317833] ../../skia/ext/pixel_ref_utils.cc:221:16: error: 'drawPosText' marked 'override' but does not override any member functions
> [14:54:14.318022] virtual void drawPosText(const SkDraw& draw,
> [14:54:14.318082] ^
>
> Original issue's description:
> > Fix SkTextBlob offset semantics.
> >
> > Implement proper x/y drawTextBlob() handling by plumbing a
> > drawPosText() offset parameter (to act as an additional glyph pos
> > translation) throughout the device layer.
> >
> > The new offset superceeds the existing constY, with a minor semantic
> > tweak: whereas previous implementations were ignoring constY in 2D
> > positioning mode (scalarsPerGlyph == 2), now the offset is always
> > observed, in all positioning modes. We can do this because existing
> > drawPosText() clients always pass constY == 0 for full positioning mode.
> >
> > R=reed@google.com, jvanverth@google.com, robertphillips@google.com
> >
> > Committed: https://skia.googlesource.com/skia/+/c13bc571d3e61a43b87eb97f0719abd304cafaf2
>
> TBR=jvanverth@google.com,reed@google.com,bsalomon@google.com,fmalita@chromium.org
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://skia.googlesource.com/skia/+/d46b8d2bab7cfba8458432248e1568ac377429e9
R=jvanverth@google.com, reed@google.com, bsalomon@google.com, robertphillips@google.com
TBR=bsalomon@google.com, jvanverth@google.com, reed@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: fmalita@chromium.org
Review URL: https://codereview.chromium.org/607413003
Diffstat (limited to 'src/core/SkTextMapStateProc.h')
-rw-r--r-- | src/core/SkTextMapStateProc.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/core/SkTextMapStateProc.h b/src/core/SkTextMapStateProc.h index 5a8dcaa3b1..8ef9389b3a 100644 --- a/src/core/SkTextMapStateProc.h +++ b/src/core/SkTextMapStateProc.h @@ -13,20 +13,22 @@ class SkTextMapStateProc { public: - SkTextMapStateProc(const SkMatrix& matrix, SkScalar y, int scalarsPerPosition) + SkTextMapStateProc(const SkMatrix& matrix, const SkPoint& offset, int scalarsPerPosition) : fMatrix(matrix) , fProc(matrix.getMapXYProc()) - , fY(y) - , fScaleX(fMatrix.getScaleX()) - , fTransX(fMatrix.getTranslateX()) { + , fOffset(offset) + , fScaleX(fMatrix.getScaleX()) { SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition); if (1 == scalarsPerPosition) { unsigned mtype = fMatrix.getType(); if (mtype & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)) { fMapCase = kX; } else { - fY = SkScalarMul(y, fMatrix.getScaleY()) + - fMatrix.getTranslateY(); + // Bake the matrix scale/translation components into fOffset, + // to expedite proc computations. + fOffset.set(SkScalarMul(offset.x(), fMatrix.getScaleX()) + fMatrix.getTranslateX(), + SkScalarMul(offset.y(), fMatrix.getScaleY()) + fMatrix.getTranslateY()); + if (mtype & SkMatrix::kScale_Mask) { fMapCase = kOnlyScaleX; } else { @@ -49,25 +51,25 @@ private: kX } fMapCase; const SkMatrix::MapXYProc fProc; - SkScalar fY; // Ignored by kXY case. - SkScalar fScaleX, fTransX; // These are only used by Only... cases. + SkPoint fOffset; // In kOnly* mode, this includes the matrix translation component. + SkScalar fScaleX; // This is only used by kOnly... cases. }; inline void SkTextMapStateProc::operator()(const SkScalar pos[], SkPoint* loc) const { switch(fMapCase) { case kXY: - fProc(fMatrix, pos[0], pos[1], loc); + fProc(fMatrix, pos[0] + fOffset.x(), pos[1] + fOffset.y(), loc); break; case kOnlyScaleX: - loc->set(SkScalarMul(fScaleX, *pos) + fTransX, fY); + loc->set(SkScalarMul(fScaleX, *pos) + fOffset.x(), fOffset.y()); break; case kOnlyTransX: - loc->set(*pos + fTransX, fY); + loc->set(*pos + fOffset.x(), fOffset.y()); break; default: SkASSERT(false); case kX: - fProc(fMatrix, *pos, fY, loc); + fProc(fMatrix, *pos + fOffset.x(), fOffset.y(), loc); break; } } |