drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "VectorDrawable: Use the matrix scale only if the matrix has no rotation or skew."

Browse Source
This commit is contained in:
Doris Liu
2015-12-30 19:17:06 +00:00
committed by Android (Google) Code Review
parent 81a83562fc a0e61572ab
commit 6380b4793c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/hwui/VectorDrawable.cpp
View File

@ -403,8 +403,15 @@ void Tree::draw(Canvas* outCanvas, SkColorFilter* colorFilter,
// canvas scale.
outCanvas->getMatrix(&mCanvasMatrix);
mBounds = bounds;
int scaledWidth = (int) (mBounds.width() * mCanvasMatrix.getScaleX());
int scaledHeight = (int) (mBounds.height() * mCanvasMatrix.getScaleY());
float canvasScaleX = 1.0f;
float canvasScaleY = 1.0f;
if (mCanvasMatrix.getSkewX() == 0 && mCanvasMatrix.getSkewY() == 0) {
// Only use the scale value when there's no skew or rotation in the canvas matrix.
canvasScaleX = mCanvasMatrix.getScaleX();
canvasScaleY = mCanvasMatrix.getScaleY();
}
int scaledWidth = (int) (mBounds.width() * canvasScaleX);
int scaledHeight = (int) (mBounds.height() * canvasScaleY);
scaledWidth = std::min(Tree::MAX_CACHED_BITMAP_SIZE, scaledWidth);
scaledHeight = std::min(Tree::MAX_CACHED_BITMAP_SIZE, scaledHeight);