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 /src/xps | |
| 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 'src/xps')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 6f62f89b45..801b80c0b0 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -35,7 +35,6 @@ #include "SkImageEncoder.h" #include "SkImagePriv.h" #include "SkMaskFilter.h" -#include "SkMatrixPriv.h" #include "SkPaint.h" #include "SkPathEffect.h" #include "SkPathOps.h" @@ -520,12 +519,12 @@ HRESULT SkXPSDevice::createXpsTransform(const SkMatrix& matrix, return S_FALSE; } XPS_MATRIX rawXpsMatrix = { - SkScalarToFLOAT(affine[SkMatrixPriv::kAScaleX]), - SkScalarToFLOAT(affine[SkMatrixPriv::kASkewY]), - SkScalarToFLOAT(affine[SkMatrixPriv::kASkewX]), - SkScalarToFLOAT(affine[SkMatrixPriv::kAScaleY]), - SkScalarToFLOAT(affine[SkMatrixPriv::kATransX]), - SkScalarToFLOAT(affine[SkMatrixPriv::kATransY]), + SkScalarToFLOAT(affine[SkMatrix::kAScaleX]), + SkScalarToFLOAT(affine[SkMatrix::kASkewY]), + SkScalarToFLOAT(affine[SkMatrix::kASkewX]), + SkScalarToFLOAT(affine[SkMatrix::kAScaleY]), + SkScalarToFLOAT(affine[SkMatrix::kATransX]), + SkScalarToFLOAT(affine[SkMatrix::kATransY]), }; HRM(this->fXpsFactory->CreateMatrixTransform(&rawXpsMatrix, xpsTransform), "Could not create transform."); |