diff options
| author |  Mike Reed <reed@google.com> | 2017-10-13 13:26:00 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-13 13:26:08 +0000 |
| commit | f0cb7a09abe35e8eff152212e68f3cee3be075df (patch) | |
| tree | 75ac268d2dd0f99c21863c79601e47bd4f7e918d /tests/MatrixTest.cpp | |
| parent | cccaef1667857432a68051000ab3f338fc2e64b6 (diff) | |
Revert "move SkMatrix anonymous affine enum to private"
This reverts commit 708ec81d7a9bba12cd7e574b5c5ae80b2ad77919.
Reason for revert: broke android
frameworks/base/core/jni/android/graphics/pdf/PdfEditor.cpp
frameworks/base/core/jni/android/graphics/pdf/PdfEditor.cpp:153:54: error: no member named 'kAScaleX' in 'SkMatrix'; did you mean 'kMScaleX'?
FS_MATRIX transform = {transformValues[SkMatrix::kAScaleX], transformValues[SkMatrix::kASkewY],
~~~~~~~~~~^~~~~~~~
Original change's description:
> move SkMatrix anonymous affine enum to private
>
> enum members aren't used by SkMatrix.h or by
> clients outside of Skia.
>
> R: reed@google.com, bungeman@google.com
> Bug: skia:6898
> Change-Id: I6873b4106e5ffe354caf5ec18cc613910304fa13
> Reviewed-on: https://skia-review.googlesource.com/59160
> Reviewed-by: Mike Reed <reed@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Cary Clark <caryclark@skia.org>
TBR=bungeman@google.com,reed@google.com,caryclark@skia.org
Change-Id: I7fe80879e8b851c9036fc910a314129c299d82d2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6898
Reviewed-on: https://skia-review.googlesource.com/59460
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/MatrixTest.cpp')
| -rw-r--r-- | tests/MatrixTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp index 3e20f0b765..6f7a14fdc7 100644 --- a/tests/MatrixTest.cpp +++ b/tests/MatrixTest.cpp @@ -6,7 +6,7 @@ */ #include "SkMath.h" -#include "SkMatrixPriv.h" +#include "SkMatrix.h" #include "SkMatrixUtils.h" #include "SkRandom.h" #include "Test.h" @@ -912,7 +912,7 @@ DEF_TEST(Matrix, reporter) { SkScalar affine[6]; REPORTER_ASSERT(reporter, mat.asAffine(affine)); - #define affineEqual(e) affine[SkMatrixPriv::kA##e] == mat.get(SkMatrix::kM##e) + #define affineEqual(e) affine[SkMatrix::kA##e] == mat.get(SkMatrix::kM##e) REPORTER_ASSERT(reporter, affineEqual(ScaleX)); REPORTER_ASSERT(reporter, affineEqual(SkewY)); REPORTER_ASSERT(reporter, affineEqual(SkewX)); |