| Index: src/core/SkMatrix.cpp
|
| diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
|
| index fb0c69d7c7287d8428e9de233c85e38280374a69..0fd802087fc0c5f52e6da2be56edbfb1b9fcc442 100644
|
| --- a/src/core/SkMatrix.cpp
|
| +++ b/src/core/SkMatrix.cpp
|
| @@ -290,12 +290,7 @@
|
| return;
|
| }
|
|
|
| - if (fTypeMask <= kTranslate_Mask) {
|
| - fMat[kMTransX] += dx;
|
| - fMat[kMTransY] += dy;
|
| - this->setTypeMask((fMat[kMTransX] != 0 || fMat[kMTransY] != 0) ? kTranslate_Mask
|
| - : kIdentity_Mask);
|
| - } else if (this->hasPerspective()) {
|
| + if (this->hasPerspective()) {
|
| SkMatrix m;
|
| m.setTranslate(dx, dy);
|
| this->preConcat(m);
|
| @@ -1105,7 +1100,7 @@
|
| void SkMatrix::mapRectScaleTranslate(SkRect* dst, const SkRect& src) const {
|
| SkASSERT(dst);
|
| SkASSERT(this->isScaleTranslate());
|
| -
|
| +
|
| SkScalar sx = fMat[kMScaleX];
|
| SkScalar sy = fMat[kMScaleY];
|
| SkScalar tx = fMat[kMTransX];
|
|
|